From a14d555c873398b14776ca4f2c33f9c69617afb9 Mon Sep 17 00:00:00 2001
From: rgrimes <rgrimes@FreeBSD.org>
Date: Tue, 30 May 1995 06:41:30 +0000
Subject: Remove trailing whitespace.

---
 eBones/acl/acl_files.c                  | 14 +++---
 eBones/des/Makefile                     |  4 +-
 eBones/des/cbc_cksm.c                   |  4 +-
 eBones/des/enc_read.c                   |  6 +--
 eBones/des/enc_writ.c                   |  6 +--
 eBones/des/fcrypt.c                     |  6 +--
 eBones/des/qud_cksm.c                   |  4 +-
 eBones/des/read_pwd.c                   |  6 +--
 eBones/des/set_key.c                    |  8 +--
 eBones/des/test/destest.c               |  2 +-
 eBones/ext_srvtab/ext_srvtab.c          | 18 +++----
 eBones/include/addr_comp.h              |  4 +-
 eBones/include/admin_server.h           |  8 +--
 eBones/include/conf-bsdapollo.h         |  4 +-
 eBones/include/conf-ultmips2.h          |  4 +-
 eBones/include/des.h                    |  4 +-
 eBones/include/kdc.h                    |  8 +--
 eBones/include/klog.h                   |  4 +-
 eBones/include/kparse.h                 | 14 +++---
 eBones/include/krb.h                    | 14 +++---
 eBones/include/krb_conf.h               |  8 +--
 eBones/include/krb_db.h                 | 14 +++---
 eBones/include/passwd_server.h          |  8 +--
 eBones/kadmin/kadmin.c                  | 66 ++++++++++++-------------
 eBones/kadmind/admin_server.c           | 18 +++----
 eBones/kadmind/kadm_funcs.c             | 40 +++++++--------
 eBones/kadmind/kadm_ser_wrap.c          |  6 +--
 eBones/kadmind/kadm_server.c            |  2 +-
 eBones/kadmind/kadm_server.h            |  6 +--
 eBones/kdb/krb_cache.c                  | 24 ++++-----
 eBones/kdb/krb_dbm.c                    | 40 +++++++--------
 eBones/kdb/krb_kdb_utils.c              | 10 ++--
 eBones/kdb/krb_lib.c                    | 26 +++++-----
 eBones/kdb/print_princ.c                | 10 ++--
 eBones/kdb_edit/kdb_edit.c              | 16 +++---
 eBones/kdb_init/kdb_init.c              | 16 +++---
 eBones/kdb_util/kdb_util.c              | 30 +++++------
 eBones/kdestroy/kdestroy.c              | 12 ++---
 eBones/kerberos/Makefile                |  4 +-
 eBones/kerberos/cr_err_reply.c          | 22 ++++-----
 eBones/kerberos/kerberos.c              | 36 +++++++-------
 eBones/kinit/kinit.c                    | 14 +++---
 eBones/klist/klist.c                    | 26 +++++-----
 eBones/krb/create_auth_reply.c          | 30 +++++------
 eBones/krb/create_ciph.c                | 24 ++++-----
 eBones/krb/create_death_packet.c        | 10 ++--
 eBones/krb/create_ticket.c              | 32 ++++++------
 eBones/krb/des_rw.c                     | 18 +++----
 eBones/krb/dest_tkt.c                   |  8 +--
 eBones/krb/fgetst.c                     | 10 ++--
 eBones/krb/get_ad_tkt.c                 | 20 ++++----
 eBones/krb/get_cred.c                   |  6 +--
 eBones/krb/get_in_tkt.c                 | 16 +++---
 eBones/krb/get_krbhst.c                 |  6 +--
 eBones/krb/get_svc_in_tkt.c             |  6 +--
 eBones/krb/get_tf_fullname.c            | 16 +++---
 eBones/krb/get_tf_realm.c               |  8 +--
 eBones/krb/getrealm.c                   |  6 +--
 eBones/krb/in_tkt.c                     |  6 +--
 eBones/krb/krb_get_in_tkt.c             | 12 ++---
 eBones/krb/kuserok.c                    | 14 +++---
 eBones/krb/mk_priv.c                    | 24 ++++-----
 eBones/krb/mk_req.c                     | 12 ++---
 eBones/krb/mk_safe.c                    | 24 ++++-----
 eBones/krb/rd_priv.c                    | 20 ++++----
 eBones/krb/rd_safe.c                    | 20 ++++----
 eBones/krb/read_service_key.c           |  8 +--
 eBones/krb/recvauth.c                   |  6 +--
 eBones/krb/send_to_kdc.c                |  4 +-
 eBones/krb/tf_shm.c                     | 22 ++++-----
 eBones/krb/tf_util.c                    | 34 ++++++-------
 eBones/ksrvtgt/ksrvtgt.c                | 12 ++---
 eBones/ksrvutil/ksrvutil.c              | 88 ++++++++++++++++-----------------
 eBones/kstash/Makefile                  |  4 +-
 eBones/kstash/kstash.c                  |  8 +--
 eBones/lib/libacl/acl_files.c           | 14 +++---
 eBones/lib/libkadm/kadm.h               |  6 +--
 eBones/lib/libkadm/kadm_cli_wrap.c      | 40 +++++++--------
 eBones/lib/libkadm/kadm_stream.c        | 26 +++++-----
 eBones/lib/libkadm/kadm_supp.c          | 44 ++++++++---------
 eBones/lib/libkdb/krb_cache.c           | 24 ++++-----
 eBones/lib/libkdb/krb_dbm.c             | 40 +++++++--------
 eBones/lib/libkdb/krb_kdb_utils.c       | 10 ++--
 eBones/lib/libkdb/krb_lib.c             | 26 +++++-----
 eBones/lib/libkdb/print_princ.c         | 10 ++--
 eBones/lib/libkrb/create_auth_reply.c   | 30 +++++------
 eBones/lib/libkrb/create_ciph.c         | 24 ++++-----
 eBones/lib/libkrb/create_death_packet.c | 10 ++--
 eBones/lib/libkrb/create_ticket.c       | 32 ++++++------
 eBones/lib/libkrb/des_rw.c              | 18 +++----
 eBones/lib/libkrb/dest_tkt.c            |  8 +--
 eBones/lib/libkrb/fgetst.c              | 10 ++--
 eBones/lib/libkrb/get_ad_tkt.c          | 20 ++++----
 eBones/lib/libkrb/get_cred.c            |  6 +--
 eBones/lib/libkrb/get_in_tkt.c          | 16 +++---
 eBones/lib/libkrb/get_krbhst.c          |  6 +--
 eBones/lib/libkrb/get_svc_in_tkt.c      |  6 +--
 eBones/lib/libkrb/get_tf_fullname.c     | 16 +++---
 eBones/lib/libkrb/get_tf_realm.c        |  8 +--
 eBones/lib/libkrb/getrealm.c            |  6 +--
 eBones/lib/libkrb/in_tkt.c              |  6 +--
 eBones/lib/libkrb/krb_get_in_tkt.c      | 12 ++---
 eBones/lib/libkrb/kuserok.c             | 14 +++---
 eBones/lib/libkrb/mk_priv.c             | 24 ++++-----
 eBones/lib/libkrb/mk_req.c              | 12 ++---
 eBones/lib/libkrb/mk_safe.c             | 24 ++++-----
 eBones/lib/libkrb/rd_priv.c             | 20 ++++----
 eBones/lib/libkrb/rd_safe.c             | 20 ++++----
 eBones/lib/libkrb/read_service_key.c    |  8 +--
 eBones/lib/libkrb/recvauth.c            |  6 +--
 eBones/lib/libkrb/send_to_kdc.c         |  4 +-
 eBones/lib/libkrb/tf_shm.c              | 22 ++++-----
 eBones/lib/libkrb/tf_util.c             | 34 ++++++-------
 eBones/libexec/registerd/registerd.c    |  2 +-
 eBones/libkadm/kadm.h                   |  6 +--
 eBones/libkadm/kadm_cli_wrap.c          | 40 +++++++--------
 eBones/libkadm/kadm_stream.c            | 26 +++++-----
 eBones/libkadm/kadm_supp.c              | 44 ++++++++---------
 eBones/passwd/kpasswd.c                 | 40 +++++++--------
 eBones/registerd/registerd.c            |  2 +-
 eBones/usr.bin/kadmin/kadmin.c          | 66 ++++++++++++-------------
 eBones/usr.bin/kdestroy/kdestroy.c      | 12 ++---
 eBones/usr.bin/kinit/kinit.c            | 14 +++---
 eBones/usr.bin/klist/klist.c            | 26 +++++-----
 eBones/usr.bin/ksrvtgt/ksrvtgt.c        | 12 ++---
 eBones/usr.bin/passwd/kpasswd.c         | 40 +++++++--------
 eBones/usr.sbin/ext_srvtab/ext_srvtab.c | 18 +++----
 eBones/usr.sbin/kadmin/admin_server.c   | 18 +++----
 eBones/usr.sbin/kadmin/kadm_funcs.c     | 40 +++++++--------
 eBones/usr.sbin/kadmin/kadm_ser_wrap.c  |  6 +--
 eBones/usr.sbin/kadmin/kadm_server.c    |  2 +-
 eBones/usr.sbin/kadmin/kadm_server.h    |  6 +--
 eBones/usr.sbin/kadmind/admin_server.c  | 18 +++----
 eBones/usr.sbin/kadmind/kadm_funcs.c    | 40 +++++++--------
 eBones/usr.sbin/kadmind/kadm_ser_wrap.c |  6 +--
 eBones/usr.sbin/kadmind/kadm_server.c   |  2 +-
 eBones/usr.sbin/kadmind/kadm_server.h   |  6 +--
 eBones/usr.sbin/kdb_edit/kdb_edit.c     | 16 +++---
 eBones/usr.sbin/kdb_init/kdb_init.c     | 16 +++---
 eBones/usr.sbin/kdb_util/kdb_util.c     | 30 +++++------
 eBones/usr.sbin/kerberos/Makefile       |  4 +-
 eBones/usr.sbin/kerberos/cr_err_reply.c | 22 ++++-----
 eBones/usr.sbin/kerberos/kerberos.c     | 36 +++++++-------
 eBones/usr.sbin/ksrvutil/ksrvutil.c     | 88 ++++++++++++++++-----------------
 eBones/usr.sbin/kstash/Makefile         |  4 +-
 eBones/usr.sbin/kstash/kstash.c         |  8 +--
 146 files changed, 1254 insertions(+), 1254 deletions(-)

(limited to 'eBones')

diff --git a/eBones/acl/acl_files.c b/eBones/acl/acl_files.c
index 6f7f3fd..1b97bb2 100644
--- a/eBones/acl/acl_files.c
+++ b/eBones/acl/acl_files.c
@@ -6,12 +6,12 @@
  * <mit-copyright.h>.
  *
  *	from: acl_files.c,v 4.4 89/12/19 13:30:53 jtkohl Exp $
- *	$Id: acl_files.c,v 1.2 1994/07/19 19:21:18 g89r4222 Exp $
+ *	$Id: acl_files.c,v 1.1.1.1 1994/09/30 14:49:48 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: acl_files.c,v 1.2 1994/07/19 19:21:18 g89r4222 Exp $";
+"$Id: acl_files.c,v 1.1.1.1 1994/09/30 14:49:48 csgr Exp $";
 #endif lint
 
 
@@ -86,7 +86,7 @@ char *canon;
 	    dot = NULL;
 	}
     }
-    
+
     /* No such luck */
     end = principal + strlen(principal);
 
@@ -121,7 +121,7 @@ char *canon;
 	strcpy(canon, KRB_REALM);
     }
 }
-	    
+
 /* Get a lock to modify acl_file */
 /* Return new FILE pointer */
 /* or NULL if file cannot be modified */
@@ -176,7 +176,7 @@ char *acl_file;
 /* Closes f */
 static int acl_commit(acl_file, f)
 char *acl_file;
-FILE *f;     
+FILE *f;
 {
     char new[LINESIZE];
     int ret;
@@ -203,7 +203,7 @@ FILE *f;
 static int
 acl_abort(acl_file, f)
 char	*acl_file;
-FILE	*f;     
+FILE	*f;
 {
 	char		new[LINESIZE];
 	int		ret;
@@ -471,7 +471,7 @@ char *principal;
 
     sprintf(buf, "*.*%s", realm);
     if(acl_exact_match(acl, buf) || acl_exact_match(acl, "*.*@*")) return(1);
-       
+
     return(0);
 }
 
diff --git a/eBones/des/Makefile b/eBones/des/Makefile
index 5afd5b5..8d5c210 100644
--- a/eBones/des/Makefile
+++ b/eBones/des/Makefile
@@ -1,10 +1,10 @@
 #	@(#)Makefile	5.4 (Berkeley) 5/7/91
-#	$Id: Makefile,v 1.4 1994/09/09 21:43:30 g89r4222 Exp $
+#	$Id: Makefile,v 1.1.1.1 1994/09/30 14:49:50 csgr Exp $
 
 LIB=	des
 SRCS=	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 \
-	cfb_enc.c 3ecb_enc.c ofb_enc.c 3cbc_enc.c 
+	cfb_enc.c 3ecb_enc.c ofb_enc.c 3cbc_enc.c
 #MAN1=	des.1
 #MAN3=	des.3
 
diff --git a/eBones/des/cbc_cksm.c b/eBones/des/cbc_cksm.c
index b28dc75..5aa25eb 100644
--- a/eBones/des/cbc_cksm.c
+++ b/eBones/des/cbc_cksm.c
@@ -2,7 +2,7 @@
 /* Copyright (C) 1993 Eric Young - see README for more details */
 
 /*-
- *	$Id: cbc_cksm.c,v 1.2 1994/07/19 19:21:45 g89r4222 Exp $
+ *	$Id: cbc_cksm.c,v 1.1.1.1 1994/09/30 14:49:50 csgr Exp $
  */
 
 #include "des_locl.h"
@@ -34,7 +34,7 @@ des_cblock *ivec;
 			}
 		else
 			c2ln(in,tin0,tin1,l);
-			
+
 		tin0^=tout0;
 		tin1^=tout1;
 		tin[0]=tin0;
diff --git a/eBones/des/enc_read.c b/eBones/des/enc_read.c
index 1b77c4c..4c6cb9e 100644
--- a/eBones/des/enc_read.c
+++ b/eBones/des/enc_read.c
@@ -2,7 +2,7 @@
 /* Copyright (C) 1993 Eric Young - see README for more details */
 
 /*-
- *	$Id: enc_read.c,v 1.2 1994/07/19 19:21:54 g89r4222 Exp $
+ *	$Id: enc_read.c,v 1.1.1.1 1994/09/30 14:49:50 csgr Exp $
  */
 
 #include <errno.h>
@@ -22,7 +22,7 @@ des_cblock *iv;
 	/* data to be unencrypted */
 	int net_num=0;
 	unsigned char net[BSIZE];
-	/* extra unencrypted data 
+	/* extra unencrypted data
 	 * for when a block of 100 comes in but is des_read one byte at
 	 * a time. */
 	static char unnet[BSIZE];
@@ -61,7 +61,7 @@ des_cblock *iv;
 
 	/* first - get the length */
 	net_num=0;
-	while (net_num < HDRSIZE) 
+	while (net_num < HDRSIZE)
 		{
 		i=read(fd,&(net[net_num]),HDRSIZE-net_num);
 		if ((i == -1) && (errno == EINTR)) continue;
diff --git a/eBones/des/enc_writ.c b/eBones/des/enc_writ.c
index 602106b..00c8f63 100644
--- a/eBones/des/enc_writ.c
+++ b/eBones/des/enc_writ.c
@@ -2,7 +2,7 @@
 /* Copyright (C) 1993 Eric Young - see README for more details */
 
 /*-
- *	$Id: enc_writ.c,v 1.2 1994/07/19 19:21:56 g89r4222 Exp $
+ *	$Id: enc_writ.c,v 1.1.1.1 1994/09/30 14:49:50 csgr Exp $
  */
 
 #include <errno.h>
@@ -67,10 +67,10 @@ des_cblock *iv;
 
 	if (des_rw_mode & DES_PCBC_MODE)
 		pcbc_encrypt((des_cblock *)p,(des_cblock *)&(outbuf[HDRSIZE]),
-			(long)((len<8)?8:len),sched,iv,DES_ENCRYPT); 
+			(long)((len<8)?8:len),sched,iv,DES_ENCRYPT);
 	else
 		cbc_encrypt((des_cblock *)p,(des_cblock *)&(outbuf[HDRSIZE]),
-			(long)((len<8)?8:len),sched,iv,DES_ENCRYPT); 
+			(long)((len<8)?8:len),sched,iv,DES_ENCRYPT);
 
 	/* output */
 	outnum=rnum+HDRSIZE;
diff --git a/eBones/des/fcrypt.c b/eBones/des/fcrypt.c
index c7f41ce..1c2a805 100644
--- a/eBones/des/fcrypt.c
+++ b/eBones/des/fcrypt.c
@@ -2,7 +2,7 @@
 /* Copyright (C) 1993 Eric Young - see README for more details */
 
 /*-
- *	$Id: fcrypt.c,v 1.2 1994/07/19 19:21:58 g89r4222 Exp $
+ *	$Id: fcrypt.c,v 1.1.1.1 1994/09/30 14:49:51 csgr Exp $
  */
 
 #include <stdio.h>
@@ -384,7 +384,7 @@ des_key_schedule schedule;
 		/* table contained 0213 4657 */
 		*(k++)=((t<<16)|(s&0x0000ffff))&0xffffffff;
 		s=     ((s>>16)|(t&0xffff0000));
-		
+
 		s=(s<<4)|(s>>28);
 		*(k++)=s&0xffffffff;
 		}
@@ -396,7 +396,7 @@ des_key_schedule schedule;
  ******************************************************************/
 
 /* The changes to this macro may help or hinder, depending on the
- * compiler and the achitecture.  gcc2 always seems to do well :-). 
+ * 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.
  */
diff --git a/eBones/des/qud_cksm.c b/eBones/des/qud_cksm.c
index eb7773f..a4e3215 100644
--- a/eBones/des/qud_cksm.c
+++ b/eBones/des/qud_cksm.c
@@ -2,7 +2,7 @@
 /* Copyright (C) 1993 Eric Young - see README for more details */
 
 /*-
- *	$Id: qud_cksm.c,v 1.2 1994/07/19 19:22:02 g89r4222 Exp $
+ *	$Id: qud_cksm.c,v 1.1.1.1 1994/09/30 14:49:51 csgr Exp $
  */
 
 /* From "Message Authentication"  R.R. Jueneman, S.M. Matyas, C.H. Meyer
@@ -62,7 +62,7 @@ des_cblock *seed;
 			t1=z1;
 			/* square, well sort of square */
 			z0=((((t0*t0)&0xffffffff)+((t1*t1)&0xffffffff))
-				&0xffffffff)%0x7fffffff; 
+				&0xffffffff)%0x7fffffff;
 			z1=((t0*((t1+NOISE)&0xffffffff))&0xffffffff)%0x7fffffff;
 			}
 		if (lp != NULL)
diff --git a/eBones/des/read_pwd.c b/eBones/des/read_pwd.c
index b5545d7..9d7fd43 100644
--- a/eBones/des/read_pwd.c
+++ b/eBones/des/read_pwd.c
@@ -3,7 +3,7 @@
 /* 06-Apr-92 Luke Brennan    Support for VMS */
 
 /*-
- *	$Id: read_pwd.c,v 1.1.1.1 1994/09/30 14:49:51 csgr Exp $
+ *	$Id: read_pwd.c,v 1.2 1995/01/25 02:27:00 ache Exp $
  */
 
 #include "des_locl.h"
@@ -249,7 +249,7 @@ int verify;
 			if ((p=(char *)index(buff,'\n')) != NULL)
 				*p='\0';
 			else	read_till_nl(tty);
-				
+
 			if (strcmp(buf,buff) != 0)
 				{
 				fprintf(stderr,"\nVerify failure - try again\n");
@@ -272,7 +272,7 @@ error:
 		status = SYS$QIOW(0,channel,IO$_SETMODE,&iosb,0,0
 			,tty_orig,12,0,0,0,0);
 #endif /* VMS */
-	
+
 	if (ps >= 1) popsig();
 	if (stdin != tty) fclose(tty);
 #ifdef VMS
diff --git a/eBones/des/set_key.c b/eBones/des/set_key.c
index f1ca3f4..81dd4a3 100644
--- a/eBones/des/set_key.c
+++ b/eBones/des/set_key.c
@@ -9,7 +9,7 @@
  */
 
 /*-
- *	$Id: set_key.c,v 1.2 1994/07/19 19:22:07 g89r4222 Exp $
+ *	$Id: set_key.c,v 1.1.1.1 1994/09/30 14:49:51 csgr Exp $
  */
 
 #include "des_locl.h"
@@ -87,7 +87,7 @@ des_cblock *key;
 	}
 
 /* NOW DEFINED IN des_local.h
- * See ecb_encrypt.c for a pseudo description of these macros. 
+ * 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))))
@@ -126,7 +126,7 @@ des_key_schedule schedule;
 	c2l(in,c);
 	c2l(in,d);
 
-	/* do PC1 in 60 simple operations */ 
+	/* do PC1 in 60 simple operations */
 /*	PERM_OP(d,c,t,4,0x0f0f0f0f);
 	HPERM_OP(c,t,-2, 0xcccc0000);
 	HPERM_OP(c,t,-1, 0xaaaa0000);
@@ -175,7 +175,7 @@ des_key_schedule schedule;
 		/* table contained 0213 4657 */
 		*(k++)=((t<<16)|(s&0x0000ffff))&0xffffffff;
 		s=     ((s>>16)|(t&0xffff0000));
-		
+
 		s=(s<<4)|(s>>28);
 		*(k++)=s&0xffffffff;
 		}
diff --git a/eBones/des/test/destest.c b/eBones/des/test/destest.c
index bc0552c..c8b5f4b 100644
--- a/eBones/des/test/destest.c
+++ b/eBones/des/test/destest.c
@@ -362,4 +362,4 @@ unsigned char *p;
 	ret[16]='\0';
 	return(ret);
 	}
-	
+
diff --git a/eBones/ext_srvtab/ext_srvtab.c b/eBones/ext_srvtab/ext_srvtab.c
index 3a5dcec..093dfe2 100644
--- a/eBones/ext_srvtab/ext_srvtab.c
+++ b/eBones/ext_srvtab/ext_srvtab.c
@@ -1,13 +1,13 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  *
  *	from: ext_srvtab.c,v 4.1 89/07/18 16:49:30 jtkohl Exp $
- *	$Id: ext_srvtab.c,v 1.2 1994/07/19 19:22:36 g89r4222 Exp $
+ *	$Id: ext_srvtab.c,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: ext_srvtab.c,v 1.2 1994/07/19 19:22:36 g89r4222 Exp $";
+"$Id: ext_srvtab.c,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -39,12 +39,12 @@ main(argc, argv)
     int fopen_errs = 0;
     int arg;
     Principal princs[40];
-    int more; 
+    int more;
     int prompt = TRUE;
     register int n, i;
-    
+
     bzero(realm, sizeof(realm));
-    
+
     /* Parse commandline arguments */
     if (argc < 2)
 	usage();
@@ -57,7 +57,7 @@ main(argc, argv)
 		    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 -.
@@ -118,7 +118,7 @@ main(argc, argv)
 	    bcopy(&princs[i].key_low, session_key, sizeof(long));
 	    bcopy(&princs[i].key_high, session_key + sizeof(long),
 		  sizeof(long));
-	    kdb_encrypt_key (session_key, session_key, 
+	    kdb_encrypt_key (session_key, session_key,
 			     master_key, master_key_schedule, DES_DECRYPT);
 	    FWrite(session_key, sizeof session_key, 1, fout);
 	}
@@ -158,7 +158,7 @@ StampOutSecrets()
 
 usage()
 {
-    fprintf(stderr, 
+    fprintf(stderr,
 	    "Usage: %s [-n] [-r realm] instance [instance ...]\n", progname);
     exit(1);
 }
diff --git a/eBones/include/addr_comp.h b/eBones/include/addr_comp.h
index 8d001d3..290d09a 100644
--- a/eBones/include/addr_comp.h
+++ b/eBones/include/addr_comp.h
@@ -1,12 +1,12 @@
 /*
- * Copyright 1987, 1988, 1989 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988, 1989 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
  * <Copyright.MIT>.
  *
  * Include file for address comparison macros.
  *
  *	from: addr_comp.h,v 4.0 89/01/23 09:57:44 jtkohl Exp $
- *	$Id: addr_comp.h,v 1.2 1994/07/19 19:22:44 g89r4222 Exp $
+ *	$Id: addr_comp.h,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $
  */
 
 #ifndef ADDR_COMP_DEFS
diff --git a/eBones/include/admin_server.h b/eBones/include/admin_server.h
index db29c15..5209641 100644
--- a/eBones/include/admin_server.h
+++ b/eBones/include/admin_server.h
@@ -1,12 +1,12 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
- * Include file for the Kerberos administration server. 
+ * Include file for the Kerberos administration server.
  *
  *	from: admin_server.h,v 4.7 89/01/11 11:59:42 steiner Exp $
- *	$Id: admin_server.h,v 1.2 1994/07/19 19:22:47 g89r4222 Exp $
+ *	$Id: admin_server.h,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $
  */
 
 #ifndef ADMIN_SERVER_DEFS
diff --git a/eBones/include/conf-bsdapollo.h b/eBones/include/conf-bsdapollo.h
index 532d2aa..119a96d 100644
--- a/eBones/include/conf-bsdapollo.h
+++ b/eBones/include/conf-bsdapollo.h
@@ -4,7 +4,7 @@
  * <Copyright.MIT>.
  *
  *	from: conf-bsdapollo.h,v 4.1 89/01/24 14:26:22 jtkohl Exp $
- *	$Id: conf-bsdapollo.h,v 1.2 1994/07/19 19:22:50 g89r4222 Exp $
+ *	$Id: conf-bsdapollo.h,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $
  */
 
 #define BSDUNIX
@@ -18,4 +18,4 @@
  */
 #define const
 
-	
+
diff --git a/eBones/include/conf-ultmips2.h b/eBones/include/conf-ultmips2.h
index 7d202f5..9e04aad 100644
--- a/eBones/include/conf-ultmips2.h
+++ b/eBones/include/conf-ultmips2.h
@@ -6,9 +6,9 @@
  * Machine-type definitions: DECstation 3100 (MIPS R2000)
  *
  *	from: conf-ultmips2.h,v 4.0 89/01/23 09:58:32 jtkohl Exp $
- *	$Id: conf-ultmips2.h,v 1.2 1994/07/19 19:23:03 g89r4222 Exp $
+ *	$Id: conf-ultmips2.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
  */
- 
+
 #define MIPS2
 #define BITS32
 #define BIG
diff --git a/eBones/include/des.h b/eBones/include/des.h
index 9cc2056..4288c2f 100644
--- a/eBones/include/des.h
+++ b/eBones/include/des.h
@@ -5,8 +5,8 @@
  *
  * Include file for the Data Encryption Standard library.
  *
- *	from: des.h,v 4.11 89/01/17 16:24:57 rfrench Exp $ 
- *	$Id: des.h,v 1.2 1994/07/19 19:23:06 g89r4222 Exp $
+ *	from: des.h,v 4.11 89/01/17 16:24:57 rfrench Exp $
+ *	$Id: des.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
  */
 
 /* only do the whole thing once	 */
diff --git a/eBones/include/kdc.h b/eBones/include/kdc.h
index 518e5e9..2323eea 100644
--- a/eBones/include/kdc.h
+++ b/eBones/include/kdc.h
@@ -1,12 +1,12 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
- * Include file for the Kerberos Key Distribution Center. 
+ * Include file for the Kerberos Key Distribution Center.
  *
  *	from: kdc.h,v 4.1 89/01/24 17:54:04 jon Exp $
- *	$Id: kdc.h,v 1.2 1994/07/19 19:23:11 g89r4222 Exp $
+ *	$Id: kdc.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
  */
 
 #ifndef KDC_DEFS
diff --git a/eBones/include/klog.h b/eBones/include/klog.h
index e8c5070..c2bd27f 100644
--- a/eBones/include/klog.h
+++ b/eBones/include/klog.h
@@ -4,10 +4,10 @@
  * <Copyright.MIT>.
  *
  * This file defines the types of log messages logged by klog.  Each
- * type of message may be selectively turned on or off. 
+ * type of message may be selectively turned on or off.
  *
  *	from: klog.h,v 4.7 89/01/24 17:55:07 jon Exp $
- *	$Id: klog.h,v 1.2 1994/07/19 19:23:12 g89r4222 Exp $
+ *	$Id: klog.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
  */
 
 #ifndef KLOG_DEFS
diff --git a/eBones/include/kparse.h b/eBones/include/kparse.h
index 9bdc07c..cf4741c 100644
--- a/eBones/include/kparse.h
+++ b/eBones/include/kparse.h
@@ -6,14 +6,14 @@
  * Include file for kparse routines.
  *
  *	from: kparse.h,v 4.5 89/01/11 12:05:53 steiner Exp $
- *	$Id: kparse.h,v 1.2 1994/07/19 19:23:14 g89r4222 Exp $
+ *	$Id: kparse.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
  */
 
 #ifndef KPARSE_DEFS
 #define KPARSE_DEFS
 
 /*
- * values returned by fGetParameterSet() 
+ * values returned by fGetParameterSet()
  */
 
 #define PS_BAD_KEYWORD	  -2	/* unknown or duplicate keyword */
@@ -22,7 +22,7 @@
 #define PS_EOF		   1	/* nothing more in the file */
 
 /*
- * values returned by fGetKeywordValue() 
+ * values returned by fGetKeywordValue()
  */
 
 #define KV_SYNTAX	 -2	/* syntax error */
@@ -31,7 +31,7 @@
 #define KV_EOL		  1	/* nothing more on this line */
 
 /*
- * values returned by fGetToken() 
+ * values returned by fGetToken()
  */
 
 #define GTOK_BAD_QSTRING -1	/* newline found in quoted string */
@@ -44,7 +44,7 @@
 #define GTOK_WHITE	  5	/* one or more whitespace chars */
 
 /*
- * extended character classification macros 
+ * extended character classification macros
  */
 
 #define ISOCTAL(CH) 	( (CH>='0')  && (CH<='7') )
@@ -54,14 +54,14 @@
 
 /*
  * tokens consist of any printable charcacter except comma, equal, or
- * whitespace 
+ * whitespace
  */
 
 #define ISTOKENCHAR(C) ((C>040) && (C<0177) && (C != ',') && (C != '='))
 
 /*
  * the parameter table defines the keywords that will be recognized by
- * fGetParameterSet, and their default values if not specified. 
+ * fGetParameterSet, and their default values if not specified.
  */
 
 typedef struct {
diff --git a/eBones/include/krb.h b/eBones/include/krb.h
index 15e831b..f0531d4 100644
--- a/eBones/include/krb.h
+++ b/eBones/include/krb.h
@@ -1,12 +1,12 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
- * Include file for the Kerberos library. 
+ * Include file for the Kerberos library.
  *
- *	from: krb.h,v 4.26 89/08/08 17:55:25 jtkohl Exp $ 
- *	$Id: krb.h,v 1.4 1994/09/24 14:15:41 g89r4222 Exp $
+ *	from: krb.h,v 4.26 89/08/08 17:55:25 jtkohl Exp $
+ *	$Id: krb.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
  */
 
 /* Only one time, please */
@@ -37,7 +37,7 @@ typedef unsigned short gid_t;
 #endif /* NO_UIDGID_T */
 
 /*
- * Kerberos specific definitions 
+ * 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
@@ -47,7 +47,7 @@ typedef unsigned short gid_t;
  * 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. 
+ * the realm.
  */
 
 #ifdef notdef
diff --git a/eBones/include/krb_conf.h b/eBones/include/krb_conf.h
index 824d5fe..5cd0ab9 100644
--- a/eBones/include/krb_conf.h
+++ b/eBones/include/krb_conf.h
@@ -6,15 +6,15 @@
  * This file contains configuration information for the Kerberos library
  * which is machine specific; currently, this file contains
  * configuration information for the vax, the "ibm032" (RT), and the
- * "PC8086" (IBM PC). 
+ * "PC8086" (IBM PC).
  *
  * Note:  cross-compiled targets must appear BEFORE their corresponding
  * cross-compiler host.  Otherwise, both will be defined when running
  * the native compiler on the programs that construct cross-compiled
- * sources. 
+ * sources.
  *
- *	from: krb_conf.h,v 4.0 89/01/23 09:59:27 jtkohl Exp $ 
- *	$Id: krb_conf.h,v 1.2 1994/07/19 19:23:18 g89r4222 Exp $
+ *	from: krb_conf.h,v 4.0 89/01/23 09:59:27 jtkohl Exp $
+ *	$Id: krb_conf.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
  */
 
 #ifndef KRB_CONF_DEFS
diff --git a/eBones/include/krb_db.h b/eBones/include/krb_db.h
index cbe00b9..e514339e 100644
--- a/eBones/include/krb_db.h
+++ b/eBones/include/krb_db.h
@@ -1,17 +1,17 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
- * spm		Project Athena  8/85 
+ * spm		Project Athena  8/85
  *
  * This file defines data structures for the kerberos
- * authentication/authorization database. 
+ * authentication/authorization database.
  *
- * They MUST correspond to those defined in *.rel 
+ * They MUST correspond to those defined in *.rel
  *
- *	from: krb_db.h,v 4.9 89/01/24 17:55:39 jon Exp $ 
- *	$Id: krb_db.h,v 1.2 1994/07/19 19:23:19 g89r4222 Exp $
+ *	from: krb_db.h,v 4.9 89/01/24 17:55:39 jon Exp $
+ *	$Id: krb_db.h,v 1.1.1.1 1994/09/30 14:49:54 csgr Exp $
  */
 
 #ifndef KRB_DB_DEFS
diff --git a/eBones/include/passwd_server.h b/eBones/include/passwd_server.h
index cb8eb08..a8d9e18 100644
--- a/eBones/include/passwd_server.h
+++ b/eBones/include/passwd_server.h
@@ -1,12 +1,12 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  * Include file for password server
  *
- *	from: passwd_server.h,v 4.6 89/01/11 15:12:22 steiner Exp $ 
- *	$Id: passwd_server.h,v 1.2 1994/07/19 19:23:24 g89r4222 Exp $
+ *	from: passwd_server.h,v 4.6 89/01/11 15:12:22 steiner Exp $
+ *	$Id: passwd_server.h,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $
  */
 
 #ifndef PASSWD_SERVER_DEFS
diff --git a/eBones/kadmin/kadmin.c b/eBones/kadmin/kadmin.c
index 3d939bc..cbf4d6f 100644
--- a/eBones/kadmin/kadmin.c
+++ b/eBones/kadmin/kadmin.c
@@ -1,15 +1,15 @@
 /*
- * $Source: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadmin.c,v $
- * $Author: qjb $
+ * $Source: /home/ncvs/src/eBones/kadmin/kadmin.c,v $
+ * $Author: wollman $
  *
  * Copyright 1988 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see the file
  * Copyright.MIT.
  *
- * Kerberos database administrator's tool.  
- * 
- * The default behavior of kadmin is if the -m option is given 
+ * 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).
  * If you do not want this to be an available option, compile with
@@ -54,7 +54,7 @@ static char default_realm[REALM_SZ]; /* default kerberos realm */
 static char krbrlm[REALM_SZ];	/* current realm being administered */
 #ifndef NO_MULTIPLE
 static int multiple = 0;	/* Allow multiple requests per ticket */
-#endif 
+#endif
 
 main(argc, argv)
   int argc;
@@ -106,18 +106,18 @@ setvals(vals, string)
 	strcpy(realm, default_realm);
     if (strcmp(realm, krbrlm)) {
 	strcpy(krbrlm, realm);
-	if ((status = kadm_init_link(PWSERV_NAME, KRB_MASTER, krbrlm)) 
+	if ((status = kadm_init_link(PWSERV_NAME, KRB_MASTER, krbrlm))
 	    != KADM_SUCCESS)
-	    printf("kadm error for realm %s: %s\n", 
+	    printf("kadm error for realm %s: %s\n",
 		   krbrlm, error_message(status));
     }
-    if (status) 
+    if (status)
 	return 1;
     else
 	return KADM_SUCCESS;
-}    
+}
 
-void 
+void
 change_password(argc, argv)
     int     argc;
     char   *argv[];
@@ -145,7 +145,7 @@ change_password(argc, argv)
 
 	/* get the new password */
 	(void) sprintf(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);
@@ -163,13 +163,13 @@ change_password(argc, argv)
 	    clean_up();
 #endif
     }
-    else 
+    else
 	printf("kadmin: Principal does not exist.\n");
     return;
 }
 
 /*ARGSUSED*/
-void 
+void
 change_admin_password(argc, argv)
     int     argc;
     char   *argv[];
@@ -206,7 +206,7 @@ change_admin_password(argc, argv)
     return;
 }
 
-void 
+void
 add_new_key(argc, argv)
     int     argc;
     char   *argv[];
@@ -228,10 +228,10 @@ add_new_key(argc, argv)
 	/* get the admin's password */
 	if (get_admin_password() != GOOD_PW)
 	    return;
-	
+
 	/* get the new password */
 	(void) sprintf(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);
@@ -253,7 +253,7 @@ add_new_key(argc, argv)
     return;
 }
 
-void 
+void
 get_entry(argc, argv)
     int     argc;
     char   *argv[];
@@ -283,12 +283,12 @@ get_entry(argc, argv)
 	/* 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));
-	
+
 #ifndef NO_MULTIPLE
 	if (!multiple)
 	    clean_up();
@@ -300,7 +300,7 @@ get_entry(argc, argv)
 }
 
 
-void 
+void
 help(argc, argv)
     int     argc;
     char   *argv[];
@@ -435,18 +435,18 @@ do_init(argc, argv)
 #else
 #define OPTION_STRING "u:r:"
 #endif
-    
+
     bzero(myname, sizeof(myname));
 
     if (!inited) {
-	/* 
-	 * This is only as a default/initial realm; we don't care 
+	/*
+	 * This is only as a default/initial realm; we don't care
 	 * about failure.
 	 */
 	if (krb_get_lrealm(default_realm, 1) != KSUCCESS)
 	    strcpy(default_realm, KRB_REALM);
 
-	/* 
+	/*
 	 * If we can reach the local realm, initialize to it.  Otherwise,
 	 * don't initialize.
 	 */
@@ -455,7 +455,7 @@ do_init(argc, argv)
 	else
 	    strcpy(krbrlm, default_realm);
 
-	while ((c = getopt(argc, argv, OPTION_STRING)) != EOF) 
+	while ((c = getopt(argc, argv, OPTION_STRING)) != EOF)
 	    switch (c) {
 	      case 'u':
 		strncpy(myname, optarg, sizeof(myname) - 1);
@@ -508,9 +508,9 @@ get_admin_password()
 	/* If admin tickets exist and are valid, just exit. */
 	bzero(&c, 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 
+	     * tickets will probably last long enough for the next
 	     * transaction.
 	     */
 	    if (time(0) < (c.issue_date + (5 * 60 * c.lifetime) - FUDGE_VALUE))
@@ -518,14 +518,14 @@ get_admin_password()
 	ticket_life = DEFAULT_TKT_LIFE;
     }
 #endif
-    
+
     if (princ_exists(myname, "admin", krbrlm) != PE_NO) {
 	if (read_long_pw_string(admin_passwd, sizeof(admin_passwd)-1,
 				"Admin password:", 0)) {
 	    fprintf(stderr, "Error reading admin password.\n");
 	    goto bad;
 	}
-	status = krb_get_pw_in_tkt(myname, "admin", krbrlm, PWSERV_NAME, 
+	status = krb_get_pw_in_tkt(myname, "admin", krbrlm, PWSERV_NAME,
 				   KADM_SINST, ticket_life, admin_passwd);
 	bzero(admin_passwd, sizeof(admin_passwd));
     }
@@ -546,7 +546,7 @@ get_admin_password()
 		"while getting password tickets");
 	goto bad;
     }
-    
+
  bad:
     bzero(admin_passwd, sizeof(admin_passwd));
     (void) dest_tkt();
@@ -560,8 +560,8 @@ clean_up()
     return;
 }
 
-void 
-quit() 
+void
+quit()
 {
     printf("Cleaning up and exiting.\n");
     clean_up();
diff --git a/eBones/kadmind/admin_server.c b/eBones/kadmind/admin_server.c
index cca1aaf..7f04ff2 100644
--- a/eBones/kadmind/admin_server.c
+++ b/eBones/kadmind/admin_server.c
@@ -96,7 +96,7 @@ char *argv[];
 
     if (krbrlm[0] == 0)
 	if (krb_get_lrealm(krbrlm, 0) != KSUCCESS) {
-	    fprintf(stderr, 
+	    fprintf(stderr,
 		    "Unable to get local realm.  Fix krb.conf or use -r.\n");
 	    exit(1);
 	}
@@ -165,7 +165,7 @@ doexit()
     return(0);
 #endif /* POSIX */
 }
-   
+
 unsigned pidarraysize = 0;
 int *pidarray = (int *)0;
 
@@ -217,7 +217,7 @@ kadm_listen()
 	    if (errno != EINTR)
 		log("select: %s",error_message(errno));
 	    continue;
-	}      
+	}
 	if (FD_ISSET(admin_fd, &readfds)) {
 	    /* accept the conn */
 	    addrlen = sizeof(peer);
@@ -297,7 +297,7 @@ struct sockaddr_in *who;
       /* db locked */
       u_long retcode = KADM_DB_INUSE;
       char *pdat;
-      
+
       dat_len = KADM_VERSIZE + sizeof(u_long);
       dat = (u_char *) malloc((unsigned)dat_len);
       pdat = (char *) dat;
@@ -352,10 +352,10 @@ struct sockaddr_in *who;
 	}
 	if ((retval = kadm_ser_in(&dat,&dat_len)) != KADM_SUCCESS)
 	    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 = (u_short) dat_len;
 
@@ -364,13 +364,13 @@ struct sockaddr_in *who;
 	    abort();			/* XXX */
 	}
 	dlen = htons(dlen);
-    
+
 	if (krb_net_write(fd, (char *)&dlen, sizeof(u_short)) < 0) {
 	    log("writing dlen to client: %s",error_message(errno));
 	    (void) close(fd);
 	    cleanexit(6);
 	}
-    
+
 	if (krb_net_write(fd, (char *)dat, dat_len) < 0) {
 	    log(LOG_ERR, "writing to client: %s",error_message(errno));
 	    (void) close(fd);
@@ -435,7 +435,7 @@ kill_children()
 {
     register int i;
     int osigmask;
-    
+
     osigmask = sigblock(sigmask(SIGCHLD));
 
     for (i = 0; i < pidarraysize; i++) {
diff --git a/eBones/kadmind/kadm_funcs.c b/eBones/kadmind/kadm_funcs.c
index 585a834..9f06e30 100644
--- a/eBones/kadmind/kadm_funcs.c
+++ b/eBones/kadmind/kadm_funcs.c
@@ -13,7 +13,7 @@ static char rcsid_kadm_funcs_c[] =
 "Id: kadm_funcs.c,v 4.3 90/03/20 01:39:51 jon Exp ";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: kadm_funcs.c,v 1.1 1995/01/20 03:12:55 wollman Exp $";
 #endif	lint
 
 /*
@@ -40,7 +40,7 @@ enum acl_types acltype;
     extern char *acldir;
 
     (void) sprintf(checkname, "%s.%s@%s", pname, pinst, prealm);
-    
+
     switch (acltype) {
     case ADDACL:
 	(void) sprintf(filename, "%s%s", acldir, ADD_ACL_FILE);
@@ -85,7 +85,7 @@ Kadm_vals *valsout;
 	       rname, rinstance, rrealm, valsin->name, valsin->instance);
     return KADM_UNAUTH;
   }
-  
+
   /* Need to check here for "legal" name and instance */
   if (wildcard(valsin->name) || wildcard(valsin->instance)) {
       failadd(KADM_ILL_WILDCARD);
@@ -93,7 +93,7 @@ Kadm_vals *valsout;
 
   (void) log("request to add an entry for '%s.%s' from '%s.%s@%s'",
 		 valsin->name, valsin->instance, rname, rinstance, rrealm);
-  
+
   numfound = kerb_get_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST,
 				&default_princ, 1, &more);
   if (numfound == -1) {
@@ -111,7 +111,7 @@ Kadm_vals *valsout;
   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; 
+      data_i.max_life = default_princ.max_life;
 
   bzero((char *)&default_princ, sizeof(default_princ));
 
@@ -131,7 +131,7 @@ Kadm_vals *valsout;
   bzero((char *)newpw, sizeof(newpw));
 
   data_o = data_i;
-  numfound = kerb_get_principal(valsin->name, valsin->instance, 
+  numfound = kerb_get_principal(valsin->name, valsin->instance,
 				&data_o, 1, &more);
   if (numfound == -1) {
       failadd(KADM_DB_INUSE);
@@ -150,7 +150,7 @@ Kadm_vals *valsout;
     } else if (numfound) {
 	failadd(KADM_UK_SERROR);
     } else {
-      numfound = kerb_get_principal(valsin->name, valsin->instance, 
+      numfound = kerb_get_principal(valsin->name, valsin->instance,
 				    &data_o, 1, &more);
       if ((numfound!=1) || (more!=0)) {
 	  failadd(KADM_UK_RERROR);
@@ -183,22 +183,22 @@ Kadm_vals *valsout;			/* what data is there */
   int more;			/* To point to more name.instances */
   Principal data_o;		/* Data object to hold Principal */
 
-  
+
   if (!check_access(rname, rinstance, rrealm, GETACL)) {
     (void) log("WARNING: '%s.%s@%s' tried to get '%s.%s's entry",
 	    rname, rinstance, rrealm, valsin->name, valsin->instance);
     return KADM_UNAUTH;
   }
-  
+
   if (wildcard(valsin->name) || wildcard(valsin->instance)) {
       failget(KADM_ILL_WILDCARD);
   }
 
   (void) log("retrieve '%s.%s's entry for '%s.%s@%s'",
 	     valsin->name, valsin->instance, rname, rinstance, rrealm);
-  
+
   /* Look up the record in the database */
-  numfound = kerb_get_principal(valsin->name, valsin->instance, 
+  numfound = kerb_get_principal(valsin->name, valsin->instance,
 				&data_o, 1, &more);
   if (numfound == -1) {
       failget(KADM_DB_INUSE);
@@ -231,17 +231,17 @@ Kadm_vals *valsout;		/* the actual record which is returned */
   if (wildcard(valsin1->name) || wildcard(valsin1->instance)) {
       failmod(KADM_ILL_WILDCARD);
   }
-  
+
   if (!check_access(rname, rinstance, rrealm, MODACL)) {
     (void) log("WARNING: '%s.%s@%s' tried to change '%s.%s's entry",
 	       rname, rinstance, rrealm, valsin1->name, valsin1->instance);
     return KADM_UNAUTH;
   }
-  
+
   (void) log("request to modify '%s.%s's entry from '%s.%s@%s' ",
 	     valsin1->name, valsin1->instance, rname, rinstance, rrealm);
-  
-  numfound = kerb_get_principal(valsin1->name, valsin1->instance, 
+
+  numfound = kerb_get_principal(valsin1->name, valsin1->instance,
 				&data_o, 1, &more);
   if (numfound == -1) {
       failmod(KADM_DB_INUSE);
@@ -254,7 +254,7 @@ Kadm_vals *valsout;		/* the actual record which is returned */
       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; 
+	  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;
@@ -289,7 +289,7 @@ Kadm_vals *valsout;		/* the actual record which is returned */
       } else if (more) {
 	  failmod(KADM_UK_SERROR);
       } else {
-	  numfound = kerb_get_principal(valsin1->name, valsin1->instance, 
+	  numfound = kerb_get_principal(valsin1->name, valsin1->instance,
 					&data_o, 1, &more);
 	  if ((more!=0)||(numfound!=1)) {
 	      failmod(KADM_UK_RERROR);
@@ -335,14 +335,14 @@ des_cblock newpw;
   }
   (void) log("'%s.%s@%s' wants to change its password",
 	     rname, rinstance, rrealm);
-  
+
   bcopy(newpw, local_pw, 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, ENCRYPT);
 
-  numfound = kerb_get_principal(rname, rinstance, 
+  numfound = kerb_get_principal(rname, rinstance,
 				&data_o, 1, &more);
   if (numfound == -1) {
       failchange(KADM_DB_INUSE);
diff --git a/eBones/kadmind/kadm_ser_wrap.c b/eBones/kadmind/kadm_ser_wrap.c
index c019bc0..79196c6 100644
--- a/eBones/kadmind/kadm_ser_wrap.c
+++ b/eBones/kadmind/kadm_ser_wrap.c
@@ -12,7 +12,7 @@ static char rcsid_module_c[] =
 "BonesHeader: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_ser_wrap.c,v 4.4 89/09/26 09:29:36 jtkohl Exp ";
 #endif	lint
 
-/* 
+/*
 kadm_ser_wrap.c
 unwraps wrapped packets and calls the appropriate server subroutine
 */
@@ -28,7 +28,7 @@ unwraps wrapped packets and calls the appropriate server subroutine
 
 Kadm_Server server_parm;
 
-/* 
+/*
 kadm_ser_init
 set up the server_parm structure
 */
@@ -147,7 +147,7 @@ int *dat_len;
 #else
     des_key_sched(ad.session, sess_sched);
 #endif
-    if (retc = (int) krb_rd_priv(in_st, r_len, sess_sched, ad.session, 
+    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();
diff --git a/eBones/kadmind/kadm_server.c b/eBones/kadmind/kadm_server.c
index 56631d3..25a58be 100644
--- a/eBones/kadmind/kadm_server.c
+++ b/eBones/kadmind/kadm_server.c
@@ -15,7 +15,7 @@ static char rcsid_kadm_server_c[] =
 #include <kadm.h>
 #include <kadm_err.h>
 
-/* 
+/*
 kadm_ser_cpw - the server side of the change_password routine
   recieves    : KTEXT, {key}
   returns     : CKSUM, RETCODE
diff --git a/eBones/kadmind/kadm_server.h b/eBones/kadmind/kadm_server.h
index db9d21f..33b1904 100644
--- a/eBones/kadmind/kadm_server.h
+++ b/eBones/kadmind/kadm_server.h
@@ -1,7 +1,7 @@
 /*
- * $Source: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.h,v $
- * $Author: jtkohl $
- * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.h,v 4.1 89/12/21 17:46:51 jtkohl Exp 
+ * $Source: /home/ncvs/src/eBones/kadmind/kadm_server.h,v $
+ * $Author: wollman $
+ * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.h,v 4.1 89/12/21 17:46:51 jtkohl Exp
  *
  * Copyright 1988 by the Massachusetts Institute of Technology.
  *
diff --git a/eBones/kdb/krb_cache.c b/eBones/kdb/krb_cache.c
index 4d8c594..8da1d7d 100644
--- a/eBones/kdb/krb_cache.c
+++ b/eBones/kdb/krb_cache.c
@@ -1,17 +1,17 @@
 /*
- * Copyright 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
  * <Copyright.MIT>.
  *
  * This is where a cache would be implemented, if it were necessary.
  *
  *	from: krb_cache.c,v 4.5 89/01/24 18:12:34 jon Exp $
- *	$Id: krb_cache.c,v 1.2 1994/07/19 19:23:35 g89r4222 Exp $
+ *	$Id: krb_cache.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: krb_cache.c,v 1.2 1994/07/19 19:23:35 g89r4222 Exp $";
+"$Id: krb_cache.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -34,7 +34,7 @@ extern long kerb_debug;
 static  init = 0;
 
 /*
- * initialization routine for cache 
+ * initialization routine for cache
  */
 
 int
@@ -45,7 +45,7 @@ kerb_cache_init()
 }
 
 /*
- * look up a principal in the cache returns number of principals found 
+ * look up a principal in the cache returns number of principals found
  */
 
 int
@@ -66,7 +66,7 @@ kerb_cache_get_principal(serv, inst, principal, max)
 	fprintf(stderr, "cache_get_principal for %s %s max = %d\n",
 	    serv, inst, max);
 #endif DEBUG
-    
+
 #ifdef DEBUG
     if (kerb_debug & 2) {
 	if (found) {
@@ -83,7 +83,7 @@ kerb_cache_get_principal(serv, inst, principal, max)
 
 /*
  * insert/replace a principal in the cache returns number of principals
- * inserted 
+ * inserted
  */
 
 int
@@ -106,13 +106,13 @@ kerb_cache_put_principal(principal, max)
 	    max);
     }
 #endif
-    
+
     for (i = 0; i < max; i++) {
 #ifdef DEBUG
 	if (kerb_debug & 2)
 	    fprintf(stderr, "\n %s %s",
 		    principal->name, principal->instance);
-#endif	
+#endif
 	/* DO IT */
 	count++;
 	principal++;
@@ -121,7 +121,7 @@ kerb_cache_put_principal(principal, max)
 }
 
 /*
- * look up a dba in the cache returns number of dbas found 
+ * look up a dba in the cache returns number of dbas found
  */
 
 int
@@ -158,7 +158,7 @@ kerb_cache_get_dba(serv, inst, dba, max)
 }
 
 /*
- * insert/replace a dba in the cache returns number of dbas inserted 
+ * insert/replace a dba in the cache returns number of dbas inserted
  */
 
 int
@@ -183,7 +183,7 @@ kerb_cache_put_dba(dba, max)
 	if (kerb_debug & 2)
 	    fprintf(stderr, "\n %s %s",
 		    dba->name, dba->instance);
-#endif	
+#endif
 	/* DO IT */
 	count++;
 	dba++;
diff --git a/eBones/kdb/krb_dbm.c b/eBones/kdb/krb_dbm.c
index 25ec48f..8bc283b 100644
--- a/eBones/kdb/krb_dbm.c
+++ b/eBones/kdb/krb_dbm.c
@@ -1,15 +1,15 @@
 /*
- * Copyright 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  *	from: krb_dbm.c,v 4.9 89/04/18 16:15:13 wesommer Exp $
- *	$Id: krb_dbm.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $
+ *	$Id: krb_dbm.c,v 1.2 1995/01/25 19:45:25 ache Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: krb_dbm.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $";
+"$Id: krb_dbm.c,v 1.2 1995/01/25 19:45:25 ache Exp $";
 #endif	lint
 
 #if defined(__FreeBSD__)
@@ -69,14 +69,14 @@ static int non_blocking = 0;
 
 /*
  * 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 
+ * 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
@@ -93,12 +93,12 @@ static int non_blocking = 0;
  * 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
@@ -140,7 +140,7 @@ static char *gen_dbsuffix(db_name, sfx)
     char *sfx;
 {
     char *dbsuffix;
-    
+
     if (sfx == NULL)
 	sfx = ".ok";
 
@@ -162,7 +162,7 @@ kerb_db_init()
 
 /*
  * gracefully shut down database--must be called by ANY program that does
- * a kerb_db_init 
+ * a kerb_db_init
  */
 
 kerb_db_fini()
@@ -201,7 +201,7 @@ long kerb_get_db_age()
     struct stat st;
     char *okname;
     long age;
-    
+
     okname = gen_dbsuffix(current_db_name, ".ok");
 
     if (stat (okname, &st) < 0)
@@ -226,7 +226,7 @@ static long kerb_start_update(db_name)
 {
     char *okname = gen_dbsuffix(db_name, ".ok");
     long age = kerb_get_db_age();
-    
+
     if (unlink(okname) < 0
 	&& errno != ENOENT) {
 	    age = -1;
@@ -243,7 +243,7 @@ static long kerb_end_update(db_name, age)
     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;
@@ -355,7 +355,7 @@ kerb_db_rename(from, to)
     char *fromok = gen_dbsuffix(from, ".ok");
     long trans = kerb_start_update(to);
     int ok;
-    
+
 #ifndef __FreeBSD__
     if ((rename (fromdir, todir) == 0)
 	&& (rename (frompag, topag) == 0)) {
@@ -384,7 +384,7 @@ kerb_db_rename(from, to)
 
 /*
  * look up a principal in the data base returns number of principals
- * found , and whether there were more than requested. 
+ * found , and whether there were more than requested.
  */
 
 kerb_db_get_principal(name, inst, principal, max, more)
@@ -627,7 +627,7 @@ delta_stat(a, b, c)
 
 /*
  * look up a dba in the data base returns number of dbas found , and
- * whether there were more than requested. 
+ * whether there were more than requested.
  */
 
 kerb_db_get_dba(dba_name, dba_inst, dba, max, more)
@@ -650,7 +650,7 @@ kerb_db_iterate (func, arg)
     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;
@@ -701,7 +701,7 @@ static int kerb_dbl_lock(mode)
     int     mode;
 {
     int flock_mode;
-    
+
     if (!inited)
 	kerb_dbl_init();
     if (mylock) {		/* Detect lock call when lock already
@@ -723,8 +723,8 @@ static int kerb_dbl_lock(mode)
     }
     if (non_blocking)
 	flock_mode |= LOCK_NB;
-    
-    if (flock(dblfd, flock_mode) < 0) 
+
+    if (flock(dblfd, flock_mode) < 0)
 	return errno;
     mylock++;
     return 0;
diff --git a/eBones/kdb/krb_kdb_utils.c b/eBones/kdb/krb_kdb_utils.c
index 5fccc53..c283e0f 100644
--- a/eBones/kdb/krb_kdb_utils.c
+++ b/eBones/kdb/krb_kdb_utils.c
@@ -10,12 +10,12 @@
  * Jon Rochlis, MIT Telecom, March 1988
  *
  *	from: krb_kdb_utils.c,v 4.1 89/07/26 11:01:12 jtkohl Exp $
- *	$Id: krb_kdb_utils.c,v 1.2 1994/07/19 19:23:38 g89r4222 Exp $
+ *	$Id: krb_kdb_utils.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: krb_kdb_utils.c,v 1.2 1994/07/19 19:23:38 g89r4222 Exp $";
+"$Id: krb_kdb_utils.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $";
 #endif	lint
 
 #include <des.h>
@@ -79,7 +79,7 @@ long kdb_verify_master_key (master_key, master_key_sched, out)
   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) 
+    if (out != (FILE *) NULL)
       fprintf(out,
 	      "verify_master_key: %s, %d found.\n",
 	      "Kerberos error on master key version lookup",
@@ -96,11 +96,11 @@ long kdb_verify_master_key (master_key, master_key_sched, out)
 
   /*
    * now use the master key to decrypt the key in the db, had better
-   * be the same! 
+   * be the same!
    */
   bcopy(&principal_data[0].key_low, key_from_db, 4);
   bcopy(&principal_data[0].key_high, ((long *) key_from_db) + 1, 4);
-  kdb_encrypt_key (key_from_db, key_from_db, 
+  kdb_encrypt_key (key_from_db, key_from_db,
 		   master_key, master_key_sched, DECRYPT);
 
   /* the decrypted database key had better equal the master key */
diff --git a/eBones/kdb/krb_lib.c b/eBones/kdb/krb_lib.c
index f0f1f6f..b90d1a5 100644
--- a/eBones/kdb/krb_lib.c
+++ b/eBones/kdb/krb_lib.c
@@ -1,16 +1,16 @@
 /*
- * $Source: /home/CVS/src/eBones/kdb/krb_lib.c,v $
- * $Author: g89r4222 $ 
+ * $Source: /home/ncvs/src/eBones/kdb/krb_lib.c,v $
+ * $Author: csgr $
  *
- * Copyright 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1988 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
+ * <mit-copyright.h>.
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: krb_lib.c,v 1.2 1994/07/19 19:23:39 g89r4222 Exp $";
+"$Id: krb_lib.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -37,7 +37,7 @@ extern char *getenv();
 static  init = 0;
 
 /*
- * initialization routine for data base 
+ * initialization routine for data base
  */
 
 int
@@ -64,7 +64,7 @@ kerb_init()
 /*
  * 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. 
+ * caches, if they're ever really implemented.
  */
 
 int
@@ -75,7 +75,7 @@ kerb_fini()
 
 /*
  * look up a principal in the cache or data base returns number of
- * principals found 
+ * principals found
  */
 
 int
@@ -99,10 +99,10 @@ kerb_get_principal(name, inst, principal, max, more)
 	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. 
+     * since the cache may not be exhaustive.
      */
 
     /* clear the principal area */
@@ -111,7 +111,7 @@ kerb_get_principal(name, inst, principal, max, more)
 #ifdef CACHE
     /*
      * so check to see if the name contains a wildcard "*" or "?", not
-     * preceeded by a backslash. 
+     * preceeded by a backslash.
      */
     wild = 0;
     if (index(name, '*') || index(name, '?') ||
@@ -206,7 +206,7 @@ kerb_get_dba(name, inst, dba, max, more)
 #endif
     /*
      * if this is a request including a wild card, have to go to db
-     * since the cache may not be exhaustive. 
+     * since the cache may not be exhaustive.
      */
 
     /* clear the dba area */
@@ -215,7 +215,7 @@ kerb_get_dba(name, inst, dba, max, more)
 #ifdef CACHE
     /*
      * so check to see if the name contains a wildcard "*" or "?", not
-     * preceeded by a backslash. 
+     * preceeded by a backslash.
      */
 
     wild = 0;
diff --git a/eBones/kdb/print_princ.c b/eBones/kdb/print_princ.c
index 730cfb7..d04ca39 100644
--- a/eBones/kdb/print_princ.c
+++ b/eBones/kdb/print_princ.c
@@ -1,15 +1,15 @@
 /*
- * Copyright 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
- *	from: $Header: /home/CVS/src/eBones/kdb/print_princ.c,v 1.2 1994/07/19 19:23:41 g89r4222 Exp $
- *	$Id: print_princ.c,v 1.2 1994/07/19 19:23:41 g89r4222 Exp $
+ *	from: $Header: /home/ncvs/src/eBones/kdb/print_princ.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $
+ *	$Id: print_princ.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: print_princ.c,v 1.2 1994/07/19 19:23:41 g89r4222 Exp $";
+"$Id: print_princ.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
diff --git a/eBones/kdb_edit/kdb_edit.c b/eBones/kdb_edit/kdb_edit.c
index 4c02db6..438317f 100644
--- a/eBones/kdb_edit/kdb_edit.c
+++ b/eBones/kdb_edit/kdb_edit.c
@@ -5,19 +5,19 @@
  * <Copyright.MIT>.
  *
  * This routine changes the Kerberos encryption keys for principals,
- * i.e., users or services. 
+ * i.e., users or services.
  *
  *	from: kdb_edit.c,v 4.2 90/01/09 16:05:09 raeburn Exp $
- *	$Id: kdb_edit.c,v 1.3 1994/09/09 21:43:46 g89r4222 Exp $
+ *	$Id: kdb_edit.c,v 1.1.1.1 1994/09/30 14:49:56 csgr Exp $
  */
 
 /*
- * exit returns 	 0 ==> success -1 ==> error 
+ * exit returns 	 0 ==> success -1 ==> error
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kdb_edit.c,v 1.3 1994/09/09 21:43:46 g89r4222 Exp $";
+"$Id: kdb_edit.c,v 1.1.1.1 1994/09/30 14:49:56 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -158,7 +158,7 @@ main(argc, argv)
 
 #endif
 
-    if (kdb_get_master_key ((nflag == 0), 
+    if (kdb_get_master_key ((nflag == 0),
 			    master_key, master_key_schedule) != 0) {
       fprintf (stdout, "Couldn't read master key.\n");
       fflush (stdout);
@@ -241,7 +241,7 @@ change_principal()
 	    if (!creating) {
 		/*
 		 * copy the existing data so we can use the old values
-		 * for the qualifier clause of the replace 
+		 * for the qualifier clause of the replace
 		 */
 		principal_data[i].old = (char *) &old_principal;
 		bcopy(&principal_data[i], &old_principal,
@@ -310,7 +310,7 @@ change_principal()
 		}
 
 		/* seal it under the kerberos master key */
-		kdb_encrypt_key (new_key, new_key, 
+		kdb_encrypt_key (new_key, new_key,
 				 master_key, master_key_schedule,
 				 ENCRYPT);
 		bcopy(new_key, &principal_data[i].key_low, 4);
@@ -398,7 +398,7 @@ change_principal()
 
 	    /*
 	     * remaining fields -- key versions and mod info, should
-	     * not be directly manipulated 
+	     * not be directly manipulated
 	     */
 	    if (changed) {
 		if (kerb_put_principal(&principal_data[i], 1)) {
diff --git a/eBones/kdb_init/kdb_init.c b/eBones/kdb_init/kdb_init.c
index dc7055e..7a8e32f 100644
--- a/eBones/kdb_init/kdb_init.c
+++ b/eBones/kdb_init/kdb_init.c
@@ -1,18 +1,18 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  * program to initialize the database,  reports error if database file
- * already exists. 
+ * already exists.
  *
  *	from: kdb_init.c,v 4.0 89/01/24 21:50:45 jtkohl Exp $
- *	$Id: kdb_init.c,v 1.3 1994/09/24 14:04:17 g89r4222 Exp $
+ *	$Id: kdb_init.c,v 1.1.1.1 1994/09/30 14:49:56 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kdb_init.c,v 1.3 1994/09/24 14:04:17 g89r4222 Exp $";
+"$Id: kdb_init.c,v 1.1.1.1 1994/09/30 14:49:56 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -44,7 +44,7 @@ main(argc, argv)
     char   *cp;
     int code;
     char *database;
-    
+
     progname = (cp = rindex(*argv, '/')) ? cp + 1 : *argv;
 
     if (argc > 3) {
@@ -96,7 +96,7 @@ main(argc, argv)
 	add_principal(KERB_M_NAME, KERB_M_INST, MASTER_KEY) ||
 	add_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST, NULL_KEY) ||
 	add_principal("krbtgt", realm, RANDOM_KEY) ||
-	add_principal("changepw", KRB_MASTER, RANDOM_KEY) 
+	add_principal("changepw", KRB_MASTER, RANDOM_KEY)
 	) {
 	fprintf(stderr, "\n%s: couldn't initialize database.\n",
 		progname);
@@ -169,7 +169,7 @@ add_principal(name, instance, aap_op)
     principal.old = 0;
 
     kerb_db_put_principal(&principal, 1);
-    
+
     /* let's play it safe */
     bzero (new_key, sizeof (C_Block));
     bzero (&principal.key_low, 4);
diff --git a/eBones/kdb_util/kdb_util.c b/eBones/kdb_util/kdb_util.c
index 8465b5b..7bc8559 100644
--- a/eBones/kdb_util/kdb_util.c
+++ b/eBones/kdb_util/kdb_util.c
@@ -7,17 +7,17 @@
  * 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. 
+ * should happen with other processes shutdown.
  *
  * Written July 9, 1987 by Jeffrey I. Schiller
  *
  *	from: kdb_util.c,v 4.4 90/01/09 15:57:20 raeburn Exp $
- *	$Id: kdb_util.c,v 1.3 1994/09/24 14:04:21 g89r4222 Exp $
+ *	$Id: kdb_util.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kdb_util.c,v 1.3 1994/09/24 14:04:21 g89r4222 Exp $";
+"$Id: kdb_util.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -62,7 +62,7 @@ main(argc, argv)
     char *db_name;
 
     progname = prog;
-    
+
     if (argc != 3 && argc != 4) {
 	fprintf(stderr, "Usage: %s operation file-name [database name].\n",
 		argv[0]);
@@ -77,7 +77,7 @@ main(argc, argv)
 	perror("Can't open database");
 	exit(1);
     }
-    
+
     if (!strcmp(argv[1], "load"))
 	op = OP_LOAD;
     else if (!strcmp(argv[1], "dump"))
@@ -134,7 +134,7 @@ main(argc, argv)
       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);      
+      printf("Don't forget to do a `kdb_util load %s' to reload the database!\n", file_name);
       break;
     }
     exit(0);
@@ -148,7 +148,7 @@ clear_secrets ()
   bzero((char *)new_master_key_schedule, sizeof (Key_schedule));
 }
 
-/* cv_key is a procedure which takes a principle and changes its key, 
+/* 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). */
@@ -163,7 +163,7 @@ static int dump_db_1(arg, principal)
     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';
@@ -205,7 +205,7 @@ dump_db (db_file, output_file, cv_key)
 
     a.cv_key = cv_key;
     a.output_file = output_file;
-    
+
     kerb_db_iterate (dump_db_1, (char *)&a);
     return fflush(output_file);
 }
@@ -432,7 +432,7 @@ convert_old_format_db (db_file, out)
 
   /*
    * now use the master key to decrypt (old style) the key in the db, had better
-   * be the same! 
+   * be the same!
    */
   bcopy((char *)&principal_data[0].key_low, (char *)key_from_db, 4);
   bcopy((char *)&principal_data[0].key_high,
@@ -451,7 +451,7 @@ convert_old_format_db (db_file, out)
     fprintf(stderr, "does not match database.\n");
     exit (-1);
   }
-    
+
   fprintf(stderr, "Master key verified.\n");
   (void) fflush(stderr);
 
@@ -468,14 +468,14 @@ register char *cp;
     int local;
 
     zaptime(&tp);			/* clear out the struct */
-    
+
     if (strlen(cp) > 10) {		/* new format */
 	(void) strncpy(wbuf, cp, 4);
 	wbuf[4] = 0;
 	tp.tm_year = atoi(wbuf);
 	cp += 4;			/* step over the year */
 	local = 0;			/* GMT */
-    } else {				/* old format: local time, 
+    } else {				/* old format: local time,
 					   year is 2 digits, assuming 19xx */
 	wbuf[0] = *cp++;
 	wbuf[1] = *cp++;
@@ -492,11 +492,11 @@ register char *cp;
     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);
diff --git a/eBones/kdestroy/kdestroy.c b/eBones/kdestroy/kdestroy.c
index f010fcd..8a7cbb7 100644
--- a/eBones/kdestroy/kdestroy.c
+++ b/eBones/kdestroy/kdestroy.c
@@ -1,21 +1,21 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  * This program causes Kerberos tickets to be destroyed.
- * Options are: 
+ * Options are:
  *
  *   -q[uiet]	- no bell even if tickets not destroyed
- *   -f[orce]	- no message printed at all 
+ *   -f[orce]	- no message printed at all
  *
  *	from: kdestroy.c,v 4.5 88/03/18 15:16:02 steiner Exp $
- *	$Id: kdestroy.c,v 1.2 1994/07/19 19:24:16 g89r4222 Exp $
+ *	$Id: kdestroy.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kdestroy.c,v 1.2 1994/07/19 19:24:16 g89r4222 Exp $";
+"$Id: kdestroy.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
diff --git a/eBones/kerberos/Makefile b/eBones/kerberos/Makefile
index 7f36cf7..44853ef 100644
--- a/eBones/kerberos/Makefile
+++ b/eBones/kerberos/Makefile
@@ -1,9 +1,9 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.2 1994/07/19 19:24:22 g89r4222 Exp $
+#	$Id: Makefile,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $
 
 PROG=	kerberos
 SRCS=	kerberos.c cr_err_reply.c
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include 
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 NOMAN=	noman
diff --git a/eBones/kerberos/cr_err_reply.c b/eBones/kerberos/cr_err_reply.c
index 585fd03..c5178fe 100644
--- a/eBones/kerberos/cr_err_reply.c
+++ b/eBones/kerberos/cr_err_reply.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: cr_err_reply.c,v 4.10 89/01/10 11:34:42 steiner Exp $
- *	$Id: cr_err_reply.c,v 1.1 1994/07/19 19:24:24 g89r4222 Exp $
+ *	$Id: cr_err_reply.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: cr_err_reply.c,v 1.1 1994/07/19 19:24:24 g89r4222 Exp $";
+"$Id: cr_err_reply.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $";
 #endif /* lint */
 
 #include <sys/types.h>
@@ -30,28 +30,28 @@ extern int req_act_vno;		/* this is defined in the kerberos
  * 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
  */
 
diff --git a/eBones/kerberos/kerberos.c b/eBones/kerberos/kerberos.c
index b980577..a7f391c 100644
--- a/eBones/kerberos/kerberos.c
+++ b/eBones/kerberos/kerberos.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: kerberos.c,v 4.19 89/11/01 17:18:07 qjb Exp $
- *	$Id: kerberos.c,v 1.3 1994/09/09 21:43:51 g89r4222 Exp $
+ *	$Id: kerberos.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: kerberos.c,v 1.3 1994/09/09 21:43:51 g89r4222 Exp $";
+"$Id: kerberos.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $";
 #endif  lint
 
 #include <stdio.h>
@@ -97,7 +97,7 @@ static void hang();
  */
 static void usage()
 {
-    fprintf(stderr, "Usage: %s [-s] [-m] [-n] [-p pause_seconds]%s%s\n", progname, 
+    fprintf(stderr, "Usage: %s [-s] [-m] [-n] [-p pause_seconds]%s%s\n", progname,
 	    " [-a max_age] [-l log_file] [-r realm]"
 	    ," [database_pathname]"
 	    );
@@ -160,7 +160,7 @@ main(argc, argv)
 	    break;
 	case 'a':
 	    /* Set max age. */
-	    if (!isdigit(optarg[0])) 
+	    if (!isdigit(optarg[0]))
 		usage();
 	    max_age = atoi(optarg);
 	    if ((max_age < ONE_HOUR) || (max_age > THREE_DAYS)) {
@@ -194,9 +194,9 @@ main(argc, argv)
 
     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)
@@ -205,12 +205,12 @@ main(argc, argv)
 	printf("\tSleep forever on error\n");
     if (mflag)
 	printf("\tMaster key will be entered manually\n");
-    
+
     printf("\tLog file is %s\n", lflag ? log_file : KRBLOG);
 
     if (lflag)
 	kset_logfile(log_file);
-    
+
     /* find our hostname, and use it as the instance */
     if (gethostname(k_instance, INST_SZ)) {
 	fprintf(stderr, "%s: gethostname error\n", progname);
@@ -249,7 +249,7 @@ main(argc, argv)
 
     /* 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");
@@ -449,7 +449,7 @@ kerberos(client, pkt)
 
 	    /*
 	     * get the user's key, unseal it from the server's key, and
-	     * use it to seal the cipher 
+	     * use it to seal the cipher
 	     */
 
 	    /* a_name_data.key_low a_name_data.key_high */
@@ -457,7 +457,7 @@ kerberos(client, pkt)
 	    bcopy(&a_name_data.key_high, ((long *) key) + 1, 4);
 
 	    /* unseal the a_name key from the master key */
-	    kdb_encrypt_key(key, key, master_key, 
+	    kdb_encrypt_key(key, key, master_key,
 			    master_key_schedule, DECRYPT);
 
 	    create_ciph(ciph, session_key, s_name_data.name,
@@ -616,10 +616,10 @@ kerberos(client, pkt)
 
 
 /*
- * setup_disc 
+ * setup_disc
  *
  * disconnect all descriptors, remove ourself from the process
- * group that spawned us. 
+ * group that spawned us.
  */
 
 setup_disc()
@@ -648,7 +648,7 @@ setup_disc()
 
 /*
  * kerb_er_reply creates an error reply packet and sends it to the
- * client. 
+ * client.
  */
 
 kerb_err_reply(client, pkt, err, string)
@@ -680,7 +680,7 @@ kerb_err_reply(client, pkt, err, string)
 static void check_db_age()
 {
     long age;
-    
+
     if (max_age != -1) {
 	/* Requires existance of kerb_get_db_age() */
 	gettimeofday(&kerb_time, 0);
@@ -712,16 +712,16 @@ check_princ(p_name, instance, lifetime, p)
     klog(L_ALL_REQ,
 	 "Principal: \"%s\", Instance: \"%s\" Lifetime = %d n = %d",
 	 p_name, instance, lifetime, n, 0);
-    
+
     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. 
+     * and stuff into cipher.
      */
     if (n == 0) {
 	/* service unknown, log error, skip to next request */
diff --git a/eBones/kinit/kinit.c b/eBones/kinit/kinit.c
index 94ce0fe..9f531d1 100644
--- a/eBones/kinit/kinit.c
+++ b/eBones/kinit/kinit.c
@@ -1,13 +1,13 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  * 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. 
+ * for the Kerberos ticket-granting service for future use.
  *
- * Options are: 
+ * Options are:
  *
  *   -i[instance]
  *   -r[realm]
@@ -15,12 +15,12 @@
  *   -l[ifetime]
  *
  *	from: kinit.c,v 4.12 90/03/20 16:11:15 jon Exp $
- *	$Id: kinit.c,v 1.2 1994/07/19 19:24:33 g89r4222 Exp $
+ *	$Id: kinit.c,v 1.1.1.1 1994/09/30 14:49:58 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kinit.c,v 1.2 1994/07/19 19:24:33 g89r4222 Exp $";
+"$Id: kinit.c,v 1.1.1.1 1994/09/30 14:49:58 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -151,7 +151,7 @@ main(argc, argv)
 				strncpy(aname, pwd->pw_name, sizeof(aname));
 		}
 	}
-		
+
 	if (!*aname)
 	    exit(0);
 	if (!k_isname(aname)) {
diff --git a/eBones/klist/klist.c b/eBones/klist/klist.c
index 4a95bc0..bfc3aa0 100644
--- a/eBones/klist/klist.c
+++ b/eBones/klist/klist.c
@@ -1,18 +1,18 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  * Lists your current Kerberos tickets.
  * Written by Bill Sommerfeld, MIT Project Athena.
  *
  *	from: klist.c,v 4.15 89/08/30 11:19:16 jtkohl Exp $
- *	$Id: klist.c,v 1.2 1994/07/19 19:24:38 g89r4222 Exp $
+ *	$Id: klist.c,v 1.1.1.1 1994/09/30 14:49:58 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: klist.c,v 1.2 1994/07/19 19:24:38 g89r4222 Exp $";
+"$Id: klist.c,v 1.1.1.1 1994/09/30 14:49:58 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -97,11 +97,11 @@ int tgt_test, long_form;
     if (long_form)
 	printf("Ticket file:	%s\n", file);
 
-    /* 
-     * Since krb_get_tf_realm will return a ticket_file error, 
+    /*
+     * 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 
+     * 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)
@@ -116,7 +116,7 @@ int tgt_test, long_form;
     /* Close ticket file */
     (void) 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
@@ -143,13 +143,13 @@ int tgt_test, long_form;
 	    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 
+     * 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%s%s%s%s\n\n", pname,
 	       (pinst[0] ? "." : ""), pinst,
@@ -218,7 +218,7 @@ char *file;
     int count;
 
     printf("Server key file:   %s\n", file);
-	
+
     if ((stab = open(file, O_RDONLY, 0400)) < 0) {
 	perror(file);
 	exit(1);
diff --git a/eBones/krb/create_auth_reply.c b/eBones/krb/create_auth_reply.c
index e47d4df..bfc3cfe 100644
--- a/eBones/krb/create_auth_reply.c
+++ b/eBones/krb/create_auth_reply.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: create_auth_reply.c,v 4.10 89/01/13 17:47:38 steiner Exp $
- *	$Id: create_auth_reply.c,v 1.2 1994/07/19 19:24:56 g89r4222 Exp $
+ *	$Id: create_auth_reply.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: create_auth_reply.c,v 1.2 1994/07/19 19:24:56 g89r4222 Exp $";
+"$Id: create_auth_reply.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -30,34 +30,34 @@ static char *rcsid =
  * 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
  */
 
diff --git a/eBones/krb/create_ciph.c b/eBones/krb/create_ciph.c
index c3bc0db..634d371 100644
--- a/eBones/krb/create_ciph.c
+++ b/eBones/krb/create_ciph.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: create_ciph.c,v 4.8 89/05/18 21:24:26 jis Exp $
- *	$Id: create_ciph.c,v 1.2 1994/07/19 19:24:58 g89r4222 Exp $
+ *	$Id: create_ciph.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: create_ciph.c,v 1.2 1994/07/19 19:24:58 g89r4222 Exp $";
+"$Id: create_ciph.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -30,24 +30,24 @@ static char *rcsid =
  * 			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
diff --git a/eBones/krb/create_death_packet.c b/eBones/krb/create_death_packet.c
index f747d6b..080e8a8 100644
--- a/eBones/krb/create_death_packet.c
+++ b/eBones/krb/create_death_packet.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: create_death_packet.c,v 4.9 89/01/17 16:05:59 rfrench Exp $
- *	$Id: create_death_packet.c,v 1.2 1994/07/19 19:24:59 g89r4222 Exp $
+ *	$Id: create_death_packet.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: create_death_packet.c,v 1.2 1994/07/19 19:24:59 g89r4222 Exp $";
+"$Id: create_death_packet.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -32,12 +32,12 @@ static char *rcsid =
  * ----			-----------		----
  *
  * 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
diff --git a/eBones/krb/create_ticket.c b/eBones/krb/create_ticket.c
index 984d8e9..95d5ced 100644
--- a/eBones/krb/create_ticket.c
+++ b/eBones/krb/create_ticket.c
@@ -1,16 +1,16 @@
-/* 
+/*
  * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
  * of Technology.
  * For copying and distribution information, please see the file
  * <Copyright.MIT>.
  *
  *	from: create_ticket.c,v 4.11 89/03/22 14:43:23 jtkohl Exp $
- *	$Id: create_ticket.c,v 1.2 1994/07/19 19:25:01 g89r4222 Exp $
+ *	$Id: create_ticket.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: create_ticket.c,v 1.2 1994/07/19 19:25:01 g89r4222 Exp $";
+"$Id: create_ticket.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif /* lint */
 
 #include <stdio.h>
@@ -35,35 +35,35 @@ static char rcsid[] =
  * 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
  *
  */
diff --git a/eBones/krb/des_rw.c b/eBones/krb/des_rw.c
index c958355..e5acb39 100644
--- a/eBones/krb/des_rw.c
+++ b/eBones/krb/des_rw.c
@@ -11,7 +11,7 @@
  * are met:
  * 1. Redistributions of source code must retain the entire comment,
  *    including the above copyright notice, this list of conditions
- *    and the following disclaimer, verbatim, at the beginning of 
+ *    and the following disclaimer, verbatim, at the beginning of
  *    the source file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: des_rw.c,v 1.5 1994/09/24 18:54:41 g89r4222 Exp $
+ * $Id: des_rw.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 /*
@@ -61,11 +61,11 @@
  *     +--+--+--+--+--+--+--+--+
  *     |  garbage     | data   |
  *     |                       |
- *     +-----------------------+----> des_pcbc_encrypt() --> 
+ *     +-----------------------+----> des_pcbc_encrypt() -->
  *
  * (Note that the length field sent before the actual message specifies
  * the number of data bytes, not the length of the entire padded message.
- * 
+ *
  * When data is read, if the message received is longer than the number
  * of bytes requested, then the remaining bytes are stored until the
  * following call to des_read().  If the number of bytes received is
@@ -160,7 +160,7 @@ int des_read(fd, buf, len)
 		stored -= len;
 		buff_ptr += len;
 		return(len);
-	} else { 
+	} else {
 		if (stored) {
 			bcopy(buff_ptr, buf, stored);
 			nreturned = stored;
@@ -184,11 +184,11 @@ int des_read(fd, buf, len)
 	if(nread != pad_length)
 		return(0);
 
-	des_pcbc_encrypt((des_cblock*) des_buff, (des_cblock*) buff_ptr, 
+	des_pcbc_encrypt((des_cblock*) des_buff, (des_cblock*) buff_ptr,
 		(msg_length < 8 ? 8 : msg_length),
 		key_sched, (des_cblock*) &des_key, DES_DECRYPT);
 
-	
+
 	if(msg_length < 8)
 		buff_ptr += (8 - msg_length);
 	stored = msg_length;
@@ -237,7 +237,7 @@ int des_write(fd, buf, len)
 
 		for(i = 0 ; i < 8 ; i+= sizeof(long)) {
 			rnd = random();
-			bcopy(&rnd, garbage+i, 
+			bcopy(&rnd, garbage+i,
 				(i <= (8 - sizeof(long)))?sizeof(long):(8-i));
 		}
 		bcopy(buf, garbage + 8 - len, len);
@@ -253,7 +253,7 @@ int des_write(fd, buf, len)
 
 
 	write_len = htonl(len);
-	if(write(fd, &write_len, sizeof(write_len)) != sizeof(write_len)) 
+	if(write(fd, &write_len, sizeof(write_len)) != sizeof(write_len))
 		return(-1);
 	if(write(fd, des_buff, pad_len) != pad_len)
 		return(-1);
diff --git a/eBones/krb/dest_tkt.c b/eBones/krb/dest_tkt.c
index 17c7855..6a06454 100644
--- a/eBones/krb/dest_tkt.c
+++ b/eBones/krb/dest_tkt.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: dest_tkt.c,v 4.9 89/10/02 16:23:07 jtkohl Exp $
- *	$Id: dest_tkt.c,v 1.2 1994/07/19 19:25:07 g89r4222 Exp $
+ *	$Id: dest_tkt.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: dest_tkt.c,v 1.2 1994/07/19 19:25:07 g89r4222 Exp $";
+"$Id: dest_tkt.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif /* lint */
 
 #include <stdio.h>
@@ -75,8 +75,8 @@ out:
     if (errno == ENOENT) return RET_TKFIL;
     else if (errno != 0) return KFAILURE;
 #ifdef TKT_SHMEM
-    /* 
-     * handle the shared memory case 
+    /*
+     * handle the shared memory case
      */
     (void) strcpy(shmidname, file);
     (void) strcat(shmidname, ".shm");
diff --git a/eBones/krb/fgetst.c b/eBones/krb/fgetst.c
index d938013..b855541 100644
--- a/eBones/krb/fgetst.c
+++ b/eBones/krb/fgetst.c
@@ -1,15 +1,15 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  *	from: fgetst.c,v 4.0 89/01/23 10:08:31 jtkohl Exp $
- *	$Id: fgetst.c,v 1.2 1994/07/19 19:25:10 g89r4222 Exp $
+ *	$Id: fgetst.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: fgetst.c,v 1.2 1994/07/19 19:25:10 g89r4222 Exp $";
+"$Id: fgetst.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif	/* lint */
 
 #include <stdio.h>
@@ -20,7 +20,7 @@ static char rcsid[] =
  * until it reads a null byte.  When finished, what has been read exists
  * in "s". If "count" characters were actually read, the last is changed
  * to a null, so the returned string is always null-terminated.  fgetst
- * returns the number of characters read, including the null terminator. 
+ * returns the number of characters read, including the null terminator.
  */
 
 fgetst(f, s, n)
diff --git a/eBones/krb/get_ad_tkt.c b/eBones/krb/get_ad_tkt.c
index d8e1283..1c14d3c 100644
--- a/eBones/krb/get_ad_tkt.c
+++ b/eBones/krb/get_ad_tkt.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_ad_tkt.c,v 4.15 89/07/07 15:18:51 jtkohl Exp $
- *	$Id: get_ad_tkt.c,v 1.2 1994/07/19 19:25:11 g89r4222 Exp $
+ *	$Id: get_ad_tkt.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: get_ad_tkt.c,v 1.2 1994/07/19 19:25:11 g89r4222 Exp $";
+"$Id: get_ad_tkt.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -55,7 +55,7 @@ unsigned long rep_err_code;
  *
  * 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
@@ -106,12 +106,12 @@ get_ad_tkt(service,sinstance,realm,lifetime)
 
     /*
      * 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 
+     * 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("krbtgt",realm,lrealm,&cr)) != KSUCCESS) {
 	/*
 	 * If realm == lrealm, we have no hope, so let's not even try.
@@ -119,20 +119,20 @@ get_ad_tkt(service,sinstance,realm,lifetime)
 	if ((strncmp(realm, lrealm, REALM_SZ)) == 0)
 	    return(AD_NOTGT);
 	else{
-	    if ((kerror = 
+	    if ((kerror =
 		 get_ad_tkt("krbtgt",realm,lrealm,lifetime)) != KSUCCESS)
 		return(kerror);
 	    if ((kerror = krb_get_cred("krbtgt",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,"krbtgt",realm,lrealm,0L);
 
     if (kerror)
diff --git a/eBones/krb/get_cred.c b/eBones/krb/get_cred.c
index baf7ae2..6eb63f6 100644
--- a/eBones/krb/get_cred.c
+++ b/eBones/krb/get_cred.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_cred.c,v 4.10 89/05/31 17:46:22 jtkohl Exp $
- *	$Id: get_cred.c,v 1.2 1994/07/19 19:25:14 g89r4222 Exp $
+ *	$Id: get_cred.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: get_cred.c,v 1.2 1994/07/19 19:25:14 g89r4222 Exp $";
+"$Id: get_cred.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif /* lint */
 
 #include <stdio.h>
@@ -44,7 +44,7 @@ krb_get_cred(service,instance,realm,c)
 	return (tf_status);
 
     /* Search for requested service credentials and copy into c */
-       
+
     while ((tf_status = tf_get_cred(c)) == KSUCCESS) {
         /* Is this the right ticket? */
 	if ((strcmp(c->service,service) == 0) &&
diff --git a/eBones/krb/get_in_tkt.c b/eBones/krb/get_in_tkt.c
index 5fb1560..00fc57a 100644
--- a/eBones/krb/get_in_tkt.c
+++ b/eBones/krb/get_in_tkt.c
@@ -4,12 +4,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_in_tkt.c,v 4.12 89/07/18 16:32:56 jtkohl Exp $
- *	$Id: get_in_tkt.c,v 1.2 1994/07/19 19:25:16 g89r4222 Exp $
+ *	$Id: get_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: get_in_tkt.c,v 1.2 1994/07/19 19:25:16 g89r4222 Exp $";
+"$Id: get_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -69,7 +69,7 @@ static int passwd_to_key(user,instance,realm,passwd,key)
  * 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 
+ * 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.
@@ -86,8 +86,8 @@ krb_get_pw_in_tkt(user,instance,realm,service,sinstance,life,password)
 
 #ifdef NOENCRYPTION
 /*
- * $Source: /home/CVS/src/eBones/krb/get_in_tkt.c,v $
- * $Author: g89r4222 $
+ * $Source: /home/ncvs/src/eBones/krb/get_in_tkt.c,v $
+ * $Author: csgr $
  *
  * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
  * of Technology.
@@ -102,7 +102,7 @@ krb_get_pw_in_tkt(user,instance,realm,service,sinstance,life,password)
 
 #ifndef	lint
 static char rcsid_read_password_c[] =
-"Bones$Header: /home/CVS/src/eBones/krb/get_in_tkt.c,v 1.2 1994/07/19 19:25:16 g89r4222 Exp $";
+"Bones$Header: /home/ncvs/src/eBones/krb/get_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif	lint
 
 #include <des.h>
@@ -170,7 +170,7 @@ placebo_read_pw_string(s,max,prompt,verify)
 {
     int ok = 0;
     char *ptr;
-    
+
 #ifdef BSDUNIX
     jmp_buf old_env;
     struct sgttyb tty_state;
@@ -187,7 +187,7 @@ placebo_read_pw_string(s,max,prompt,verify)
 	goto lose;
 
     /* save terminal state*/
-    if (ioctl(0,TIOCGETP,&tty_state) == -1) 
+    if (ioctl(0,TIOCGETP,&tty_state) == -1)
 	return -1;
 
     push_signals();
diff --git a/eBones/krb/get_krbhst.c b/eBones/krb/get_krbhst.c
index 16c4ff2..bb1ea50 100644
--- a/eBones/krb/get_krbhst.c
+++ b/eBones/krb/get_krbhst.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_krbhst.c,v 4.8 89/01/22 20:00:29 rfrench Exp $
- *	$Id: get_krbhst.c,v 1.2 1994/07/19 19:25:17 g89r4222 Exp $
+ *	$Id: get_krbhst.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: get_krbhst.c,v 1.2 1994/07/19 19:25:17 g89r4222 Exp $";
+"$Id: get_krbhst.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif /* lint */
 
 #include <stdio.h>
@@ -33,7 +33,7 @@ static char *rcsid =
  *
  * The KRB_CONF file contains the name of the local realm in the first
  * line (not used by this routine), followed by lines indicating realm/host
- * entries.  The words "admin server" following the hostname indicate that 
+ * entries.  The words "admin server" following the hostname indicate that
  * the host provides an administrative database server.
  *
  * For example:
diff --git a/eBones/krb/get_svc_in_tkt.c b/eBones/krb/get_svc_in_tkt.c
index 6d9702f..0b0fe71 100644
--- a/eBones/krb/get_svc_in_tkt.c
+++ b/eBones/krb/get_svc_in_tkt.c
@@ -4,12 +4,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_svc_in_tkt.c,v 4.9 89/07/18 16:33:34 jtkohl Exp $
- *	$Id: get_svc_in_tkt.c,v 1.2 1994/07/19 19:25:26 g89r4222 Exp $
+ *	$Id: get_svc_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: get_svc_in_tkt.c,v 1.2 1994/07/19 19:25:26 g89r4222 Exp $";
+"$Id: get_svc_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -57,7 +57,7 @@ static int srvtab_to_key(user, instance, realm, srvtab, 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 
+ * 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.
diff --git a/eBones/krb/get_tf_fullname.c b/eBones/krb/get_tf_fullname.c
index 753ad1e..540e828 100644
--- a/eBones/krb/get_tf_fullname.c
+++ b/eBones/krb/get_tf_fullname.c
@@ -4,12 +4,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_tf_fullname.c,v 4.3 90/03/10 22:40:20 jon Exp $
- *	$Id: get_tf_fullname.c,v 1.2 1994/07/19 19:25:28 g89r4222 Exp $
+ *	$Id: get_tf_fullname.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: get_tf_fullname.c,v 1.2 1994/07/19 19:25:28 g89r4222 Exp $";
+"$Id: get_tf_fullname.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -22,10 +22,10 @@ static char rcsid[] =
  */
 
 /*
- * krb_get_tf_fullname() takes four arguments: the name of the 
+ * 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 
+ * 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().
  */
@@ -45,7 +45,7 @@ krb_get_tf_fullname(ticket_file, name, instance, realm)
     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)
@@ -59,8 +59,8 @@ krb_get_tf_fullname(ticket_file, name, instance, realm)
 	    return(KFAILURE);
 	else
 	    return(tf_status);
-    }    
+    }
     (void) tf_close();
-    
+
     return(tf_status);
 }
diff --git a/eBones/krb/get_tf_realm.c b/eBones/krb/get_tf_realm.c
index f405dcb..df2845e 100644
--- a/eBones/krb/get_tf_realm.c
+++ b/eBones/krb/get_tf_realm.c
@@ -4,12 +4,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_tf_realm.c,v 4.2 90/01/02 13:40:19 jtkohl Exp $
- *	$Id: get_tf_realm.c,v 1.2 1994/07/19 19:25:30 g89r4222 Exp $
+ *	$Id: get_tf_realm.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: get_tf_realm.c,v 1.2 1994/07/19 19:25:30 g89r4222 Exp $";
+"$Id: get_tf_realm.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -21,9 +21,9 @@ static char rcsid[] =
  */
 
 /*
- * krb_get_tf_realm() takes two arguments: the name of a ticket 
+ * krb_get_tf_realm() takes two arguments: the name of a ticket
  * and a variable to store the name of the realm in.
- * 
+ *
  */
 
 krb_get_tf_realm(ticket_file, realm)
diff --git a/eBones/krb/getrealm.c b/eBones/krb/getrealm.c
index 96e9588..c850bd0 100644
--- a/eBones/krb/getrealm.c
+++ b/eBones/krb/getrealm.c
@@ -6,12 +6,12 @@
  * routine to convert hostname into realm name.
  *
  *	from: getrealm.c,v 4.6 90/01/02 13:35:56 jtkohl Exp $
- *	$Id: getrealm.c,v 1.2 1994/07/19 19:25:31 g89r4222 Exp $
+ *	$Id: getrealm.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: getrealm.c,v 1.2 1994/07/19 19:25:31 g89r4222 Exp $";
+"$Id: getrealm.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif	lint
 
 #include <strings.h>
@@ -92,7 +92,7 @@ char *host;
 			fclose(trans_file);
 			return(ret_realm);
 		}
-		if ((trans_host[0] == '.') && domain) { 
+		if ((trans_host[0] == '.') && domain) {
 			/* this is a domain match */
 			if (!strcasecmp(trans_host, domain)) {
 				/* domain match, save for later */
diff --git a/eBones/krb/in_tkt.c b/eBones/krb/in_tkt.c
index 53510da..5a05259 100644
--- a/eBones/krb/in_tkt.c
+++ b/eBones/krb/in_tkt.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: kt.c,v 4.9 89/10/25 19:03:35 qjb Exp $
- *	$Id: in_tkt.c,v 1.5 1994/09/24 14:30:09 g89r4222 Exp $
+ *	$Id: in_tkt.c,v 1.1.1.1 1994/09/30 14:50:01 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: in_tkt.c,v 1.5 1994/09/24 14:30:09 g89r4222 Exp $";
+"$Id: in_tkt.c,v 1.1.1.1 1994/09/30 14:50:01 csgr Exp $";
 #endif /* lint */
 
 #include <unistd.h>
@@ -73,7 +73,7 @@ in_tkt(pname,pinst)
 		    (void) close(fd);
 		    goto out;
 		}
-	    
+
 	    (void) fsync(fd);
 	    (void) close(fd);
 	}
diff --git a/eBones/krb/krb_get_in_tkt.c b/eBones/krb/krb_get_in_tkt.c
index a37bb60..af92bc6 100644
--- a/eBones/krb/krb_get_in_tkt.c
+++ b/eBones/krb/krb_get_in_tkt.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: der: krb_get_in_tkt.c,v 4.19 89/07/18 16:31:31 jtkohl Exp $
- *	$Id: krb_get_in_tkt.c,v 1.2 1994/07/19 19:25:47 g89r4222 Exp $
+ *	$Id: krb_get_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: krb_get_in_tkt.c,v 1.2 1994/07/19 19:25:47 g89r4222 Exp $";
+"$Id: krb_get_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -48,16 +48,16 @@ static int decrypt_tkt(user, instance, realm, arg, key_proc, cipp)
 #ifndef NOENCRYPTION
     /* Attempt to decrypt it */
 #endif
-    
+
     /* generate a key */
-    
+
     {
 	register int rc;
 	rc = (*key_proc)(user,instance,realm,arg,key);
 	if (rc)
 	    return(rc);
     }
-    
+
 #ifndef NOENCRYPTION
     key_sched(key,key_s);
     pcbc_encrypt((C_Block *)cip->dat,(C_Block *)cip->dat,
@@ -259,7 +259,7 @@ krb_get_in_tkt(user, instance, realm, service, sinstance, life,
     kvno = (unsigned char) ptr[1];
     tkt->length = (unsigned char) ptr[2];
     ptr += 3;
-    
+
     if ((tkt->length < 0) ||
 	((tkt->length + (ptr - (char *) cip->dat)) > cip->length))
 	return(INTK_BADPW);
diff --git a/eBones/krb/kuserok.c b/eBones/krb/kuserok.c
index cb1f708..404532d 100644
--- a/eBones/krb/kuserok.c
+++ b/eBones/krb/kuserok.c
@@ -7,12 +7,12 @@
  * access to a local account
  *
  *	from: kuserok.c,v 4.5 89/01/23 09:25:21 jtkohl Exp $
- *	$Id: kuserok.c,v 1.2 1994/07/19 19:25:50 g89r4222 Exp $
+ *	$Id: kuserok.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kuserok.c,v 1.2 1994/07/19 19:25:50 g89r4222 Exp $";
+"$Id: kuserok.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $";
 #endif	lint
 
 #include <krb.h>
@@ -60,9 +60,9 @@ static char rcsid[] =
  * The parmtable defines the keywords we will recognize with their
  * default values, and keeps a pointer to the found value.  The found
  * value should be filled in with strsave(), since FreeParameterSet()
- * will release memory for all non-NULL found strings. 
+ * will release memory for all non-NULL found strings.
  *
-*** NOTE WELL! *** 
+*** NOTE WELL! ***
  *
  * The table below is very nice, but we cannot hard-code a default for the
  * realm: we have to get the realm via krb_get_lrealm().  Even though the
@@ -70,7 +70,7 @@ static char rcsid[] =
  * kuserok to whatever krb_get_lrealm() tells us.  That code assumes that
  * the realm will be the entry number in the table below, so if you
  * change the order of the entries below, you have to change the
- * #definition of REALM_SCRIPT to reflect it. 
+ * #definition of REALM_SCRIPT to reflect it.
  */
 #define REALM_SUBSCRIPT 1
 parmtable kparm[] = {
@@ -113,7 +113,7 @@ kuserok(kdata, luser)
 	 * if he's trying to log in as himself, and there is no .klogin file,
 	 * let him.  To find out, call
 	 * krb_kntoln to convert the triple in kdata to a name which we can
-	 * string compare. 
+	 * string compare.
 	 */
 	if (!krb_kntoln(kdata, kuser) && (strcmp(kuser, luser) == 0)) {
 	    return(OK);
@@ -141,7 +141,7 @@ kuserok(kdata, luser)
 
     /*
      * change the default realm from the hard-coded value to the
-     * accepted realm that Kerberos specifies. 
+     * accepted realm that Kerberos specifies.
      */
     rc = krb_get_lrealm(local_realm, 1);
     if (rc == KSUCCESS)
diff --git a/eBones/krb/mk_priv.c b/eBones/krb/mk_priv.c
index 3bae4ed..3050cf4 100644
--- a/eBones/krb/mk_priv.c
+++ b/eBones/krb/mk_priv.c
@@ -16,12 +16,12 @@
  * Steve Miller    Project Athena  MIT/DEC
  *
  *	from: mk_priv.c,v 4.13 89/03/22 14:48:59 jtkohl Exp $
- *	$Id: mk_priv.c,v 1.2 1994/07/19 19:25:56 g89r4222 Exp $
+ *	$Id: mk_priv.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: mk_priv.c,v 1.2 1994/07/19 19:25:56 g89r4222 Exp $";
+"$Id: mk_priv.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $";
 #endif /* lint */
 
 /* system include files */
@@ -80,7 +80,7 @@ static long msg_time_sec;
 #ifndef NOENCRYPT
  * we encrypt from here with pcbc_encrypt
 #endif
- * 
+ *
  * 4 bytes		length			length of user data
  * length		in			user data
  * 1 byte		msg_time_5ms		timestamp milliseconds
@@ -154,15 +154,15 @@ long krb_mk_priv(in,out,length,schedule,key,sender,receiver)
      * 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 (lsb_net_ulong_less(sender->sin_addr.s_addr, /* src < recv */ 
-			  receiver->sin_addr.s_addr)==-1) 
-        msg_time_sec =  -msg_time_sec; 
-    else if (lsb_net_ulong_less(sender->sin_addr.s_addr, 
-				receiver->sin_addr.s_addr)==0) 
-        if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port) == -1) 
-            msg_time_sec = -msg_time_sec; 
+    /* For compatibility with broken old code, compares are done in VAX
+       byte order (LSBFIRST) */
+    if (lsb_net_ulong_less(sender->sin_addr.s_addr, /* src < recv */
+			  receiver->sin_addr.s_addr)==-1)
+        msg_time_sec =  -msg_time_sec;
+    else if (lsb_net_ulong_less(sender->sin_addr.s_addr,
+				receiver->sin_addr.s_addr)==0)
+        if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port) == -1)
+            msg_time_sec = -msg_time_sec;
     /* stuff time sec */
     bcopy((char *)&msg_time_sec,(char *)p,sizeof(msg_time_sec));
     p += sizeof(msg_time_sec);
diff --git a/eBones/krb/mk_req.c b/eBones/krb/mk_req.c
index bb0f097..fd31717 100644
--- a/eBones/krb/mk_req.c
+++ b/eBones/krb/mk_req.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: der: mk_req.c,v 4.17 89/07/07 15:20:35 jtkohl Exp $
- *	$Id: mk_req.c,v 1.2 1994/07/19 19:25:57 g89r4222 Exp $
+ *	$Id: mk_req.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: mk_req.c,v 1.2 1994/07/19 19:25:57 g89r4222 Exp $";
+"$Id: mk_req.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -95,14 +95,14 @@ krb_mk_req(authent,service,instance,realm,checksum)
     /* Get the ticket and move it into the authenticator */
     if (krb_ap_req_debug)
         printf("Realm: %s\n",realm);
-    /* 
+    /*
      * Determine realm of these tickets.  We will send this to the
      * KDC from which we are requesting tickets so it knows what to
      * with our session key.
      */
     if ((retval = krb_get_tf_realm(TKT_FILE, myrealm)) != KSUCCESS)
 	return(retval);
-    
+
     retval = krb_get_cred(service,instance,realm,&cr);
 
     if (retval == RET_NOTKT) {
@@ -177,10 +177,10 @@ krb_mk_req(authent,service,instance,realm,checksum)
     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.
  */
 
diff --git a/eBones/krb/mk_safe.c b/eBones/krb/mk_safe.c
index 567004b..46a80f7 100644
--- a/eBones/krb/mk_safe.c
+++ b/eBones/krb/mk_safe.c
@@ -15,12 +15,12 @@
  * Steve Miller    Project Athena  MIT/DEC
  *
  *	from: mk_safe.c,v 4.12 89/03/22 14:50:49 jtkohl Exp $
- *	$Id: mk_safe.c,v 1.2 1994/07/19 19:25:59 g89r4222 Exp $
+ *	$Id: mk_safe.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: mk_safe.c,v 1.2 1994/07/19 19:25:59 g89r4222 Exp $";
+"$Id: mk_safe.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $";
 #endif /* lint */
 
 /* system include files */
@@ -65,7 +65,7 @@ static long msg_time_sec;
  *			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
@@ -132,15 +132,15 @@ long krb_mk_safe(in,out,length,key,sender,receiver)
      * 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 (lsb_net_ulong_less(sender->sin_addr.s_addr, /* src < recv */ 
-			  receiver->sin_addr.s_addr)==-1) 
-        msg_time_sec =  -msg_time_sec; 
-    else if (lsb_net_ulong_less(sender->sin_addr.s_addr, 
-				receiver->sin_addr.s_addr)==0) 
-        if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port) == -1) 
-            msg_time_sec = -msg_time_sec; 
+    /* For compatibility with broken old code, compares are done in VAX
+       byte order (LSBFIRST) */
+    if (lsb_net_ulong_less(sender->sin_addr.s_addr, /* src < recv */
+			  receiver->sin_addr.s_addr)==-1)
+        msg_time_sec =  -msg_time_sec;
+    else if (lsb_net_ulong_less(sender->sin_addr.s_addr,
+				receiver->sin_addr.s_addr)==0)
+        if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port) == -1)
+            msg_time_sec = -msg_time_sec;
     /*
      * all that for one tiny bit!  Heaven help those that talk to
      * themselves.
diff --git a/eBones/krb/rd_priv.c b/eBones/krb/rd_priv.c
index 9adefec..0e3d906 100644
--- a/eBones/krb/rd_priv.c
+++ b/eBones/krb/rd_priv.c
@@ -15,12 +15,12 @@
  * Steve Miller    Project Athena  MIT/DEC
  *
  *	from: rd_priv.c,v 4.14 89/04/28 11:59:42 jtkohl Exp $
- *	$Id: rd_priv.c,v 1.2 1994/07/19 19:26:11 g89r4222 Exp $
+ *	$Id: rd_priv.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[]=
-"$Id: rd_priv.c,v 1.2 1994/07/19 19:26:11 g89r4222 Exp $";
+"$Id: rd_priv.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $";
 #endif /* lint */
 
 /* system include files */
@@ -154,17 +154,17 @@ long krb_rd_priv(in,in_length,schedule,key,sender,receiver,m_data)
     p += sizeof(m_data->time_sec);
 
     /* check direction bit is the sign bit */
-    /* For compatibility with broken old code, compares are done in VAX 
-       byte order (LSBFIRST) */ 
+    /* For compatibility with broken old code, compares are done in VAX
+       byte order (LSBFIRST) */
     if (lsb_net_ulong_less(sender->sin_addr.s_addr,
-			   receiver->sin_addr.s_addr)==-1) 
-	/* src < recv */ 
-	m_data->time_sec =  - m_data->time_sec; 
-    else if (lsb_net_ulong_less(sender->sin_addr.s_addr, 
-				receiver->sin_addr.s_addr)==0) 
+			   receiver->sin_addr.s_addr)==-1)
+	/* src < recv */
+	m_data->time_sec =  - m_data->time_sec;
+    else if (lsb_net_ulong_less(sender->sin_addr.s_addr,
+				receiver->sin_addr.s_addr)==0)
 	if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port)==-1)
 	    /* src < recv */
-	    m_data->time_sec =  - m_data->time_sec; 
+	    m_data->time_sec =  - m_data->time_sec;
     /*
      * all that for one tiny bit!
      * Heaven help those that talk to themselves.
diff --git a/eBones/krb/rd_safe.c b/eBones/krb/rd_safe.c
index e500b4d..3bfc490 100644
--- a/eBones/krb/rd_safe.c
+++ b/eBones/krb/rd_safe.c
@@ -13,12 +13,12 @@
  * Steve Miller    Project Athena  MIT/DEC
  *
  *	from: rd_safe.c,v 4.12 89/01/23 15:16:16 steiner Exp $
- *	$Id: rd_safe.c,v 1.2 1994/07/19 19:26:15 g89r4222 Exp $
+ *	$Id: rd_safe.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: rd_safe.c,v 1.2 1994/07/19 19:26:15 g89r4222 Exp $";
+"$Id: rd_safe.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $";
 #endif /* lint */
 
 /* system include files */
@@ -134,17 +134,17 @@ krb_rd_safe protocol err sizeof(u_long) != sizeof(struct in_addr)");
     p += sizeof(m_data->time_sec);
 
     /* check direction bit is the sign bit */
-    /* For compatibility with broken old code, compares are done in VAX 
-       byte order (LSBFIRST) */ 
+    /* For compatibility with broken old code, compares are done in VAX
+       byte order (LSBFIRST) */
     if (lsb_net_ulong_less(sender->sin_addr.s_addr,
-			   receiver->sin_addr.s_addr)==-1) 
-	/* src < recv */ 
-	m_data->time_sec =  - m_data->time_sec; 
-    else if (lsb_net_ulong_less(sender->sin_addr.s_addr, 
-				receiver->sin_addr.s_addr)==0) 
+			   receiver->sin_addr.s_addr)==-1)
+	/* src < recv */
+	m_data->time_sec =  - m_data->time_sec;
+    else if (lsb_net_ulong_less(sender->sin_addr.s_addr,
+				receiver->sin_addr.s_addr)==0)
 	if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port)==-1)
 	    /* src < recv */
-	    m_data->time_sec =  - m_data->time_sec; 
+	    m_data->time_sec =  - m_data->time_sec;
 
     /*
      * All that for one tiny bit!  Heaven help those that talk to
diff --git a/eBones/krb/read_service_key.c b/eBones/krb/read_service_key.c
index 4d66710..c68a8fc 100644
--- a/eBones/krb/read_service_key.c
+++ b/eBones/krb/read_service_key.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: _service_key.c,v 4.10 90/03/10 19:06:56 jon Exp $
- *	$Id: read_service_key.c,v 1.2 1994/07/19 19:26:16 g89r4222 Exp $
+ *	$Id: read_service_key.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: read_service_key.c,v 1.2 1994/07/19 19:26:16 g89r4222 Exp $";
+"$Id: read_service_key.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -26,7 +26,7 @@ static char *rcsid =
  * 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
@@ -102,7 +102,7 @@ read_service_key(service,instance,realm,kvno,file,key)
 	     strcmp(realm,"ATHENA.MIT.EDU")))
 	    continue;
 #else /* ! ATHENA_COMPAT */
-        if (strcmp(rlm,realm)) 
+        if (strcmp(rlm,realm))
 	    continue;
 #endif /* ATHENA_COMPAT */
 
diff --git a/eBones/krb/recvauth.c b/eBones/krb/recvauth.c
index fe26814..2ab364f 100644
--- a/eBones/krb/recvauth.c
+++ b/eBones/krb/recvauth.c
@@ -4,12 +4,12 @@
  * <Copyright.MIT>.
  *
  *	from: recvauth.c,v 4.4 90/03/10 19:03:08 jon Exp $";
- *	$Id: recvauth.c,v 1.2 1994/07/19 19:26:18 g89r4222 Exp $
+ *	$Id: recvauth.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: recvauth.c,v 1.2 1994/07/19 19:26:18 g89r4222 Exp $";
+"$Id: recvauth.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $";
 #endif	lint
 
 #include <krb.h>
@@ -214,7 +214,7 @@ char *version;			 /* version string (filled in) */
 	if (krb_net_read(fd, (char *)&tkt_len, sizeof(tkt_len)) !=
 	    sizeof(tkt_len))
 	    return(errno);
-    
+
 	/* sanity check */
 	ticket->length = ntohl((unsigned long)tkt_len);
 	if ((ticket->length <= 0) || (ticket->length > MAX_KTXT_LEN)) {
diff --git a/eBones/krb/send_to_kdc.c b/eBones/krb/send_to_kdc.c
index 59349c7..43f04a2 100644
--- a/eBones/krb/send_to_kdc.c
+++ b/eBones/krb/send_to_kdc.c
@@ -4,7 +4,7 @@
  * <Copyright.MIT>.
  *
  *	from: send_to_kdc.c,v 4.20 90/01/02 13:40:37 jtkohl Exp $
- *	$Id: send_to_kdc.c,v 1.2 1995/01/25 05:40:00 gibbs Exp $
+ *	$Id: send_to_kdc.c,v 1.3 1995/01/25 06:37:33 gibbs Exp $
  */
 
 #ifndef lint
@@ -257,7 +257,7 @@ static send_recv(pkt,rpkt,f,_to,addrs)
             printf("Sending message...");
         (void) fflush(stdout);
     }
-    if ((numsent = sendto(f,(char *)(pkt->dat), pkt->length, 0, 
+    if ((numsent = sendto(f,(char *)(pkt->dat), pkt->length, 0,
 			  (struct sockaddr *)_to,
                           S_AD_SZ)) != pkt->length) {
         if (krb_debug)
diff --git a/eBones/krb/tf_shm.c b/eBones/krb/tf_shm.c
index 5548f0d..f2f97ab 100644
--- a/eBones/krb/tf_shm.c
+++ b/eBones/krb/tf_shm.c
@@ -7,12 +7,12 @@
  * contributed by Dan Kolkowitz (kolk@jessica.stanford.edu).
  *
  *	from: tf_shm.c,v 4.2 89/10/25 23:26:46 qjb Exp $
- *	$Id: tf_shm.c,v 1.2 1994/07/19 19:26:26 g89r4222 Exp $
+ *	$Id: tf_shm.c,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: tf_shm.c,v 1.2 1994/07/19 19:26:26 g89r4222 Exp $";
+"$Id: tf_shm.c,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -51,15 +51,15 @@ char *file_name;
 					 don't slowly lose memory. */
 
     shmid = shmget((long)IPC_PRIVATE,MAX_BUFF, IPC_CREAT);
-    if (shmid == -1) { 
+    if (shmid == -1) {
 	if (krb_debug)
 	    perror("krb_shm_create shmget");
 	return(KFAILURE);		/* XXX */
     }
     me = getuid();
     metoo = geteuid();
-    /* 
-     * now set up the buffer so that we can modify it 
+    /*
+     * now set up the buffer so that we can modify it
      */
     shm_buf.shm_perm.uid = me;
     shm_buf.shm_perm.gid = getgid();
@@ -89,13 +89,13 @@ char *file_name;
 	    perror("krb_shm_create file");
 	(void) shmctl(shmid, IPC_RMID, 0);
 	return(KFAILURE);		/* XXX */
-    } 
+    }
     if (fchmod(fileno(sfile),0600) < 0) {
 	if (krb_debug)
 	    perror("krb_shm_create fchmod");
 	(void) shmctl(shmid, IPC_RMID, 0);
 	return(KFAILURE);		/* XXX */
-    }	
+    }
     if (me != metoo) {
 	if (setreuid(me, metoo) < 0) {
 	    /* can't switch??? barf! */
@@ -126,11 +126,11 @@ char *file_name;
 int krb_is_diskless()
 {
 	struct stat buf;
-	if (stat("/.diskless",&buf) < 0) 
+	if (stat("/.diskless",&buf) < 0)
 		return(0);
 	else return(1);
 }
-			
+
 /*
  * krb_shm_dest: destroy shared memory segment with session keys, and remove
  * file pointing to it.
@@ -156,7 +156,7 @@ char *file;
 			perror("krb_shm_dest: cannot delete shm segment");
 		    (void) fclose(sfile);
 		    return(KFAILURE);	/* XXX */
-		}		    
+		}
 	} else {
 	    if (krb_debug)
 		fprintf(stderr, "bad format in shmid file\n");
@@ -170,5 +170,5 @@ char *file;
 	return(RET_TKFIL);		/* XXX */
 }
 
-	
+
 
diff --git a/eBones/krb/tf_util.c b/eBones/krb/tf_util.c
index a9e8551..cb4908e 100644
--- a/eBones/krb/tf_util.c
+++ b/eBones/krb/tf_util.c
@@ -4,12 +4,12 @@
  * <Copyright.MIT>.
  *
  *	from: tf_util.c,v 4.9 90/03/10 19:19:45 jon Exp $
- *	$Id: tf_util.c,v 1.2 1994/07/19 19:26:28 g89r4222 Exp $
+ *	$Id: tf_util.c,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: tf_util.c,v 1.2 1994/07/19 19:26:28 g89r4222 Exp $";
+"$Id: tf_util.c,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $";
 #endif /* lint */
 
 #include <stdio.h>
@@ -51,7 +51,7 @@ char *shmat();
  *	   are invalid (ie. when deciding whether tf_init has been
  *	   called.)
  *	c. In tf_close, be sure it gets reinitialized to a negative
- *	   number. 
+ *	   number.
  */
 static  fd = -1;
 static	curpos;				/* Position in tfbfr */
@@ -109,13 +109,13 @@ static tf_gets(), tf_read();
 /*
  * 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. 
+ * 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. 
+ * shared.  If it's opened for writing, the lock is exclusive.
  *
- * Returns KSUCCESS if all went well, otherwise one of the following: 
+ * 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.
@@ -129,7 +129,7 @@ tf_init(tf_name, rw)
     uid_t   me, getuid();
     struct stat stat_buf;
 #ifdef TKT_SHMEM
-    char shmidname[MAXPATHLEN]; 
+    char shmidname[MAXPATHLEN];
     FILE *sfp;
     int shmid;
 #endif
@@ -170,7 +170,7 @@ tf_init(tf_name, rw)
      * 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. 
+     * proper error message.
      */
 
     curpos = sizeof(tfbfr);
@@ -214,7 +214,7 @@ tf_init(tf_name, rw)
     }
     tmp_shm_addr = krb_shm_addr;
 #endif /* TKT_SHMEM */
-    
+
     if (wflag) {
 	fd = open(tf_name, O_RDWR, 0600);
 	if (fd < 0) {
@@ -232,7 +232,7 @@ tf_init(tf_name, rw)
     }
     /*
      * Otherwise "wflag" is not set and the ticket file should be opened
-     * for read-only operations and locked for shared access. 
+     * for read-only operations and locked for shared access.
      */
 
     fd = open(tf_name, O_RDONLY, 0600);
@@ -256,7 +256,7 @@ tf_init(tf_name, rw)
  * 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. 
+ * was longer than ANAME_SZ, TKT_FIL_FMT is returned.
  */
 
 tf_get_pname(p)
@@ -279,7 +279,7 @@ tf_get_pname(p)
  * 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. 
+ * instance may be null.
  */
 
 tf_get_pinst(inst)
@@ -299,7 +299,7 @@ tf_get_pinst(inst)
  * 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: 
+ * KSUCCESS is returned.  Possible error codes are:
  *
  * TKT_FIL_INI  - tf_init wasn't called first
  * TKT_FIL_FMT  - bad format
@@ -394,7 +394,7 @@ tf_close()
  * 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. 
+ * in "s". If it encounters EOF or an error, it closes the ticket file.
  *
  * Possible return values are:
  *
@@ -408,7 +408,7 @@ tf_close()
  *		file is seriously ill.
  */
 
-static 
+static
 tf_gets(s, n)
     register char *s;
 {
@@ -455,7 +455,7 @@ tf_read(s, n)
     register n;
 {
     register count;
-    
+
     for (count = n; count > 0; --count) {
 	if (curpos >= sizeof(tfbfr)) {
 	    lastpos = read(fd, tfbfr, sizeof(tfbfr));
@@ -469,7 +469,7 @@ tf_read(s, n)
     }
     return n;
 }
-     
+
 char   *tkt_string();
 
 /*
diff --git a/eBones/ksrvtgt/ksrvtgt.c b/eBones/ksrvtgt/ksrvtgt.c
index 46bbd56..79acf3e 100644
--- a/eBones/ksrvtgt/ksrvtgt.c
+++ b/eBones/ksrvtgt/ksrvtgt.c
@@ -1,18 +1,18 @@
 /*
- * Copyright 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  * Get a ticket-granting-ticket given a service key file (srvtab)
  * The lifetime is the shortest allowed [1 five-minute interval]
  *
  *	from: ksrvtgt.c,v 4.3 89/07/28 10:17:28 jtkohl Exp $
- *	$Id: ksrvtgt.c,v 1.2 1994/07/19 19:26:56 g89r4222 Exp $
+ *	$Id: ksrvtgt.c,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $
  */
 
 #ifndef lint
 const char rcsid[] =
-"$Id: ksrvtgt.c,v 1.2 1994/07/19 19:26:56 g89r4222 Exp $";
+"$Id: ksrvtgt.c,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $";
 #endif /* lint */
 
 #include <stdio.h>
@@ -36,10 +36,10 @@ main(argc,argv)
 		argv[0]);
 	exit(1);
     }
-    
+
     if (argc == 4)
 	(void) strncpy(srvtab, argv[3], sizeof(srvtab) -1);
-    
+
     if (argc == 5) {
 	(void) strncpy(realm, argv[3], sizeof(realm) - 1);
 	(void) strncpy(srvtab, argv[4], sizeof(srvtab) -1);
diff --git a/eBones/ksrvutil/ksrvutil.c b/eBones/ksrvutil/ksrvutil.c
index 679d7e2..d1e9474 100644
--- a/eBones/ksrvutil/ksrvutil.c
+++ b/eBones/ksrvutil/ksrvutil.c
@@ -13,7 +13,7 @@ static char rcsid_ksrvutil_c[] =
 "BonesHeader: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/ksrvutil.c,v 4.1 89/09/26 09:33:49 jtkohl Exp ";
 #endif
 static const char rcsid[] =
-	"$Id: ksrvutil.c,v 1.1 1995/01/20 22:38:30 wollman Exp $";
+	"$Id: ksrvutil.c,v 1.2 1995/01/23 22:54:08 wollman Exp $";
 #endif	lint
 
 /*
@@ -72,9 +72,9 @@ copy_keyfile(progname, keyfile, backup_keyfile)
     char buf[BUFSIZ];		/* for copying keyfiles */
     int rcount;			/* for copying keyfiles */
     int try_again;
-    
+
     (void) bzero((char *)buf, sizeof(buf));
-    
+
     do {
 	try_again = FALSE;
 	if ((keyfile_fd = open(keyfile, O_RDONLY, 0)) < 0) {
@@ -83,8 +83,8 @@ copy_keyfile(progname, keyfile, backup_keyfile)
 	    }
 	    else {
 		try_again = TRUE;
-		if ((keyfile_fd = 
-		     open(keyfile, 
+		if ((keyfile_fd =
+		     open(keyfile,
 			  O_WRONLY | O_TRUNC | O_CREAT, SRVTAB_MODE)) < 0) {
 			err(1, "unable to create %s", keyfile);
 		}
@@ -98,8 +98,8 @@ copy_keyfile(progname, keyfile, backup_keyfile)
 
     keyfile_mode = get_mode(keyfile);
 
-    if ((backup_keyfile_fd = 
-	 open(backup_keyfile, O_WRONLY | O_TRUNC | O_CREAT, 
+    if ((backup_keyfile_fd =
+	 open(backup_keyfile, O_WRONLY | O_TRUNC | O_CREAT,
 	      keyfile_mode)) < 0) {
 	    err(1, "unable to write %s", backup_keyfile);
     }
@@ -134,8 +134,8 @@ safe_read_stdin(prompt, buf, size)
     }
     fflush(stdin);
     buf[strlen(buf)-1] = 0;
-}	
-  
+}
+
 
 void
 safe_write(progname, filename, fd, buf, len)
@@ -150,7 +150,7 @@ safe_write(progname, filename, fd, buf, len)
 	    close(fd);
 	    leave("In progress srvtab in this file.", 1);
     }
-}	
+}
 
 int
 yn(string)
@@ -161,7 +161,7 @@ yn(string)
     (void) printf("%s (y,n) [y] ", string);
     for (;;) {
 	safe_read_stdin("", ynbuf, sizeof(ynbuf));
-	
+
 	if ((ynbuf[0] == 'n') || (ynbuf[0] == 'N'))
 	    return(0);
 	else if ((ynbuf[0] == 'y') || (ynbuf[0] == 'Y') || (ynbuf[0] == 0))
@@ -174,7 +174,7 @@ yn(string)
 }
 
 void
-append_srvtab(progname, filename, fd, sname, sinst, 
+append_srvtab(progname, filename, fd, sname, sinst,
 		   srealm, key_vno, key)
   char *progname;
   char *filename;
@@ -192,7 +192,7 @@ append_srvtab(progname, filename, fd, sname, sinst,
     safe_write(progname, filename, fd, (char *)&key_vno, 1);
     safe_write(progname, filename, fd, (char *)key, sizeof(des_cblock));
     (void) fsync(fd);
-}    
+}
 
 unsigned short
 get_mode(filename)
@@ -202,8 +202,8 @@ get_mode(filename)
     unsigned short mode;
 
     (void) bzero((char *)&statbuf, sizeof(statbuf));
-    
-    if (stat(filename, &statbuf) < 0) 
+
+    if (stat(filename, &statbuf) < 0)
 	mode = SRVTAB_MODE;
     else
 	mode = statbuf.st_mode;
@@ -240,33 +240,33 @@ main(argc,argv)
     int change_this_key = FALSE;
     char databuf[BUFSIZ];
     int first_printed = FALSE;	/* have we printed the first item? */
-    
+
     int get_svc_new_key();
     void get_key_from_password();
     void print_key();
     void print_name();
-    
+
     (void) bzero((char *)sname, sizeof(sname));
     (void) bzero((char *)sinst, sizeof(sinst));
     (void) bzero((char *)srealm, sizeof(srealm));
-    
+
     (void) bzero((char *)change_tkt, sizeof(change_tkt));
     (void) bzero((char *)keyfile, sizeof(keyfile));
     (void) bzero((char *)work_keyfile, sizeof(work_keyfile));
     (void) bzero((char *)backup_keyfile, sizeof(backup_keyfile));
     (void) bzero((char *)local_realm, sizeof(local_realm));
-    
+
     (void) sprintf(change_tkt, "/tmp/tkt_ksrvutil.%d", getpid());
     krb_set_tkt_string(change_tkt);
 
     /* This is used only as a default for adding keys */
     if (krb_get_lrealm(local_realm, 1) != KSUCCESS)
 	(void) strcpy(local_realm, KRB_REALM);
-    
+
     for (i = 1; i < argc; i++) {
-	if (strcmp(argv[i], "-i") == 0) 
+	if (strcmp(argv[i], "-i") == 0)
 	    interactive++;
-	else if (strcmp(argv[i], "-k") == 0) 
+	else if (strcmp(argv[i], "-k") == 0)
 	    key++;
 	else if (strcmp(argv[i], "list") == 0) {
 	    if (arg_entered)
@@ -301,23 +301,23 @@ main(argc,argv)
 	else
 	    usage();
     }
-    
+
     if (!arg_entered)
 	usage();
 
     if (!keyfile[0])
 	(void) strcpy(keyfile, KEYFILE);
-    
+
     (void) strcpy(work_keyfile, keyfile);
     (void) strcpy(backup_keyfile, keyfile);
-    
+
     if (change || add) {
 	(void) strcat(work_keyfile, ".work");
 	(void) strcat(backup_keyfile, ".old");
-	
+
 	copy_keyfile(argv[0], keyfile, backup_keyfile);
     }
-    
+
     if (add)
 	copy_keyfile(argv[0], backup_keyfile, work_keyfile);
 
@@ -330,8 +330,8 @@ main(argc,argv)
     }
 
     if (change) {
-	if ((work_keyfile_fd = 
-	     open(work_keyfile, O_WRONLY | O_CREAT | O_TRUNC, 
+	if ((work_keyfile_fd =
+	     open(work_keyfile, O_WRONLY | O_CREAT | O_TRUNC,
 		  SRVTAB_MODE)) < 0) {
 		err(1, "unable to write %s", work_keyfile);
 	}
@@ -342,7 +342,7 @@ main(argc,argv)
 		err(1, "unable to append to %s", work_keyfile);
 	}
     }
-    
+
     if (change || list) {
 	while ((getst(backup_keyfile_fd, sname, SNAME_SZ) > 0) &&
 	       (getst(backup_keyfile_fd, sinst, INST_SZ) > 0) &&
@@ -379,19 +379,19 @@ main(argc,argv)
 		    change_this_key = 1;
 		else
 		    change_this_key = 0;
-		
+
 		if (change_this_key)
 		    (void) printf("Changing to version %d.\n", key_vno + 1);
 		else if (change)
 		    (void) printf("Not changing this key.\n");
-		
+
 		if (change_this_key) {
-		    /* 
+		    /*
 		     * Pick a new key and determine whether or not
 		     * it is safe to change
 		     */
-		    if ((status = 
-			 get_svc_new_key(new_key, sname, sinst, 
+		    if ((status =
+			 get_svc_new_key(new_key, sname, sinst,
 					 srealm, keyfile)) == KADM_SUCCESS)
 			key_vno++;
 		    else {
@@ -400,9 +400,9 @@ main(argc,argv)
 			change_this_key = FALSE;
 		    }
 		}
-		else 
+		else
 		    (void) bcopy(old_key, new_key, sizeof(new_key));
-		append_srvtab(argv[0], work_keyfile, work_keyfile_fd, 
+		append_srvtab(argv[0], work_keyfile, work_keyfile_fd,
 			      sname, sinst, srealm, key_vno, new_key);
 		if (key && change_this_key) {
 		    (void) printf("Old key: ");
@@ -417,7 +417,7 @@ main(argc,argv)
 			(void) dest_tkt();
 		    }
 		    else {
-			com_err(argv[0], status, 
+			com_err(argv[0], status,
 				" attempting to change password.");
 			(void) dest_tkt();
 			/* XXX This knows the format of a keyfile */
@@ -464,17 +464,17 @@ main(argc,argv)
 		print_key(new_key);
 		(void) printf("\n");
 	    }
-	    append_srvtab(argv[0], work_keyfile, work_keyfile_fd, 
+	    append_srvtab(argv[0], work_keyfile, work_keyfile_fd,
 			  sname, sinst, srealm, key_vno, new_key);
 	    (void) printf("Key successfully added.\n");
 	} while (yn("Would you like to add another key?"));
     }
 
-    if (change || list) 
+    if (change || list)
 	if (close(backup_keyfile_fd) < 0) {
 		warn("failure closing %s, continuing", backup_keyfile);
 	}
-    
+
     if (change || add) {
 	if (close(work_keyfile_fd) < 0) {
 		err(1, "failure closing %s", work_keyfile);
@@ -525,7 +525,7 @@ get_svc_new_key(new_key, sname, sinst, srealm, keyfile)
 
     if (((status = krb_get_svc_in_tkt(sname, sinst, srealm, PWSERV_NAME,
 				      KADM_SINST, 1, keyfile)) == KSUCCESS) &&
-	((status = kadm_init_link("changepw", KRB_MASTER, srealm)) == 
+	((status = kadm_init_link("changepw", KRB_MASTER, srealm)) ==
 	 KADM_SUCCESS)) {
 #ifdef NOENCRYPTION
 	(void) bzero((char *) new_key, sizeof(des_cblock));
@@ -535,7 +535,7 @@ get_svc_new_key(new_key, sname, sinst, srealm, keyfile)
 #endif /* NOENCRYPTION */
 	return(KADM_SUCCESS);
     }
-    
+
     return(status);
 }
 
@@ -555,7 +555,7 @@ get_key_from_password(key)
     (void) des_string_to_key(password, key);
 #endif /* NOENCRYPTION */
     (void) bzero((char *)password, sizeof(password));
-}    
+}
 
 usage()
 {
diff --git a/eBones/kstash/Makefile b/eBones/kstash/Makefile
index 8331c97a..d096b9c 100644
--- a/eBones/kstash/Makefile
+++ b/eBones/kstash/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 3/5/91
-#	$Id: Makefile,v 1.2 1994/07/19 19:27:04 g89r4222 Exp $
+#	$Id: Makefile,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $
 
 PROG=	kstash
 CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes 
+LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 NOMAN=	noman
 
 .include <bsd.prog.mk>
diff --git a/eBones/kstash/kstash.c b/eBones/kstash/kstash.c
index 696e4e1..d8afe20 100644
--- a/eBones/kstash/kstash.c
+++ b/eBones/kstash/kstash.c
@@ -1,16 +1,16 @@
 /*
  * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
- * of Technology 
+ * of Technology
  * For copying and distribution information, please see the file
  * <Copyright.MIT>.
  *
  *	from: kstash.c,v 4.0 89/01/23 09:45:43 jtkohl Exp $
- *	$Id: kstash.c,v 1.2 1994/07/19 19:27:05 g89r4222 Exp $
+ *	$Id: kstash.c,v 1.1.1.1 1994/09/30 14:50:05 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kstash.c,v 1.2 1994/07/19 19:27:05 g89r4222 Exp $";
+"$Id: kstash.c,v 1.1.1.1 1994/09/30 14:50:05 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -84,7 +84,7 @@ main(argc, argv)
     clear_secrets();
 }
 
-static void 
+static void
 clear_secrets()
 {
     bzero(master_key_schedule, sizeof(master_key_schedule));
diff --git a/eBones/lib/libacl/acl_files.c b/eBones/lib/libacl/acl_files.c
index 6f7f3fd..1b97bb2 100644
--- a/eBones/lib/libacl/acl_files.c
+++ b/eBones/lib/libacl/acl_files.c
@@ -6,12 +6,12 @@
  * <mit-copyright.h>.
  *
  *	from: acl_files.c,v 4.4 89/12/19 13:30:53 jtkohl Exp $
- *	$Id: acl_files.c,v 1.2 1994/07/19 19:21:18 g89r4222 Exp $
+ *	$Id: acl_files.c,v 1.1.1.1 1994/09/30 14:49:48 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: acl_files.c,v 1.2 1994/07/19 19:21:18 g89r4222 Exp $";
+"$Id: acl_files.c,v 1.1.1.1 1994/09/30 14:49:48 csgr Exp $";
 #endif lint
 
 
@@ -86,7 +86,7 @@ char *canon;
 	    dot = NULL;
 	}
     }
-    
+
     /* No such luck */
     end = principal + strlen(principal);
 
@@ -121,7 +121,7 @@ char *canon;
 	strcpy(canon, KRB_REALM);
     }
 }
-	    
+
 /* Get a lock to modify acl_file */
 /* Return new FILE pointer */
 /* or NULL if file cannot be modified */
@@ -176,7 +176,7 @@ char *acl_file;
 /* Closes f */
 static int acl_commit(acl_file, f)
 char *acl_file;
-FILE *f;     
+FILE *f;
 {
     char new[LINESIZE];
     int ret;
@@ -203,7 +203,7 @@ FILE *f;
 static int
 acl_abort(acl_file, f)
 char	*acl_file;
-FILE	*f;     
+FILE	*f;
 {
 	char		new[LINESIZE];
 	int		ret;
@@ -471,7 +471,7 @@ char *principal;
 
     sprintf(buf, "*.*%s", realm);
     if(acl_exact_match(acl, buf) || acl_exact_match(acl, "*.*@*")) return(1);
-       
+
     return(0);
 }
 
diff --git a/eBones/lib/libkadm/kadm.h b/eBones/lib/libkadm/kadm.h
index 66284f4..965b530 100644
--- a/eBones/lib/libkadm/kadm.h
+++ b/eBones/lib/libkadm/kadm.h
@@ -1,7 +1,7 @@
 /*
- * $Source: /afs/athena.mit.edu/astaff/project/kerberos/src/include/RCS/kadm.h,v $
- * $Author: jtkohl $
- * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/include/RCS/kadm.h,v 4.2 89/09/26 09:15:20 jtkohl Exp 
+ * $Source: /home/ncvs/src/eBones/libkadm/kadm.h,v $
+ * $Author: wollman $
+ * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/include/RCS/kadm.h,v 4.2 89/09/26 09:15:20 jtkohl Exp
  *
  * Copyright 1988 by the Massachusetts Institute of Technology.
  *
diff --git a/eBones/lib/libkadm/kadm_cli_wrap.c b/eBones/lib/libkadm/kadm_cli_wrap.c
index ca20601..7e1cfa9 100644
--- a/eBones/lib/libkadm/kadm_cli_wrap.c
+++ b/eBones/lib/libkadm/kadm_cli_wrap.c
@@ -13,11 +13,11 @@ static char rcsid_kadm_cli_wrap_c[] =
 "from: Id: kadm_cli_wrap.c,v 4.6 89/12/30 20:09:45 qjb Exp";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: kadm_cli_wrap.c,v 1.1 1995/01/20 02:02:51 wollman Exp $";
 #endif	lint
 
 /*
- * kadm_cli_wrap.c the client side wrapping of the calls to the admin server 
+ * kadm_cli_wrap.c the client side wrapping of the calls to the admin server
  */
 
 #include <sys/types.h>
@@ -26,7 +26,7 @@ static const char rcsid[] =
 #include <netdb.h>
 #include <sys/socket.h>
 #include <kadm.h>
-#include <kadm_err.h> 
+#include <kadm_err.h>
 #include <krb_err.h>
 
 #ifndef NULL
@@ -42,7 +42,7 @@ static Kadm_Client client_parm;
 static des_cblock sess_key;	       /* to be filled in by kadm_cli_keyd */
 static Key_schedule sess_sched;
 
-static 
+static
 clear_secrets()
 {
 	bzero((char *)sess_key, sizeof(sess_key));
@@ -54,9 +54,9 @@ clear_secrets()
  * 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 
+ * 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
  */
 kadm_init_link(n, i, r)
 char n[];
@@ -94,11 +94,11 @@ char r[];
 
 /*
  * kadm_change_pw
- * recieves    : key 
+ * 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 
+ * by a user
  */
 kadm_change_pw(newkey)
 des_cblock newkey;		       /* The DES form of the users key */
@@ -126,7 +126,7 @@ des_cblock newkey;		       /* The DES form of the users key */
 	bcopy((char *) newkey, (char *) &keytmp, 4);
 	keytmp = htonl(keytmp);
 	stsize += vts_long(keytmp, &send_st, stsize);
-	
+
 	retc = kadm_cli_send(send_st, stsize, &ret_st, &ret_sz);
 	free((char *)send_st);
 	if (retc == KADM_SUCCESS) {
@@ -139,11 +139,11 @@ des_cblock newkey;		       /* The DES form of the users key */
 /*
  * kadm_add
  * 	receives    : vals
- * 	returns     : 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 
+ * the default values they are set to
  */
 kadm_add(vals)
 Kadm_vals *vals;
@@ -176,8 +176,8 @@ Kadm_vals *vals;
 /*
  * kadm_mod
  * 	receives    : KTEXT, {values, values}
- *	returns     : CKSUM,  RETCODE, {values} 
- *	acl         : su, sms (as register or dealloc) 
+ *	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
@@ -220,13 +220,13 @@ Kadm_vals *vals2;
 
 /*
  * kadm_get
- * 	receives   : KTEXT, {values, flags} 
+ * 	receives   : KTEXT, {values, flags}
  *	returns    : CKSUM, RETCODE, {count, values, values, values}
- *	acl        : su 
+ *	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 
+ * matches there were
  */
 kadm_get(vals, fl)
 Kadm_vals *vals;
@@ -265,7 +265,7 @@ u_char fl[4];
  * kadm_cli_send
  *	recieves   : opcode, packet, packet length, serv_name, serv_inst
  *	returns    : return code from the packet build, the server, or
- *			 something else 
+ *			 something else
  *
  * It assembles a packet as follows:
  *	 8 bytes    : VERSION STRING
@@ -273,11 +273,11 @@ u_char fl[4];
  *		    : 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. 
+ * then it sends the data and waits for a reply.
  */
 kadm_cli_send(st_dat, st_siz, ret_dat, ret_siz)
 u_char *st_dat;				/* the actual data */
diff --git a/eBones/lib/libkadm/kadm_stream.c b/eBones/lib/libkadm/kadm_stream.c
index c5990a0..6ceb02e 100644
--- a/eBones/lib/libkadm/kadm_stream.c
+++ b/eBones/lib/libkadm/kadm_stream.c
@@ -13,7 +13,7 @@ static char rcsid_kadm_stream_c[] =
 "Header: /afs/athena.mit.edu/astaff/project/kerberos/src/lib/kadm/RCS/kadm_stream.c,v 4.2 89/09/26 09:20:48 jtkohl Exp ";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: kadm_stream.c,v 1.1 1995/01/20 02:02:53 wollman Exp $";
 #endif	lint
 
 /*
@@ -32,11 +32,11 @@ static const char rcsid[] =
 
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 
-/* 
+/*
 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
 */
 vals_to_stream(dt_in, dt_out)
@@ -64,16 +64,16 @@ u_char **dt_out;
       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); 
+      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);
-}  
+}
 
 build_field_header(cont, st)
 u_char *cont;			/* container for fields data */
@@ -120,7 +120,7 @@ int loc;			/* offset into the stream for current data */
   return sizeof(u_long);
 }
 
-    
+
 vts_char(dat, st, loc)
 u_char dat;			/* the attributes field */
 u_char **st;			/* a base pointer to the stream */
@@ -130,12 +130,12 @@ int loc;			/* offset into the stream for current data */
   (*st)[loc] = (u_char) dat;
   return 1;
 }
-    
-/* 
+
+/*
 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
 */
 stream_to_vals(dt_in, dt_out, maxlen)
@@ -198,7 +198,7 @@ int maxlen;				/* max length to use */
 	  break;
       }
   return stsize;
-}  
+}
 
 check_field_header(st, cont, maxlen)
 u_char *st;			/* stream */
@@ -258,7 +258,7 @@ int maxlen;			/* maximum length of st */
   *dat = ntohl(temp);		/* convert to network order */
   return sizeof(u_long);
 }
-    
+
 stv_char(st, dat, loc, maxlen)
 u_char *st;			/* a base pointer to the stream */
 u_char *dat;			/* the attributes field */
diff --git a/eBones/lib/libkadm/kadm_supp.c b/eBones/lib/libkadm/kadm_supp.c
index df97f17..8b18621 100644
--- a/eBones/lib/libkadm/kadm_supp.c
+++ b/eBones/lib/libkadm/kadm_supp.c
@@ -13,7 +13,7 @@ static char rcsid_kadm_supp_c[] =
 "Header: /afs/athena.mit.edu/astaff/project/kerberos/src/lib/kadm/RCS/kadm_supp.c,v 4.1 89/09/26 09:21:07 jtkohl Exp ";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: kadm_supp.c,v 1.1 1995/01/20 02:02:54 wollman Exp $";
 #endif	lint
 
 /*
@@ -28,7 +28,7 @@ static const char rcsid[] =
 
 #include "kadm.h"
 #include "krb_db.h"
-    
+
 /*
 prin_vals:
   recieves    : a vals structure
@@ -37,7 +37,7 @@ prin_vals(vals)
 Kadm_vals *vals;
 {
    printf("Info in Database for %s.%s:\n", vals->name, vals->instance);
-   printf("   Max Life: %d   Exp Date: %s\n",vals->max_life, 
+   printf("   Max Life: %d   Exp Date: %s\n",vals->max_life,
 	  asctime(localtime((long *)&vals->exp_date)));
    printf("   Attribs: %.2x  key: %u %u\n",vals->attributes,
 	  vals->key_low, vals->key_high);
@@ -54,7 +54,7 @@ int s;
 #endif
 
 /* 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, 
+   it copies the fields in Principal specified by fields into Kadm_vals,
    i.e from old to new */
 
 kadm_prin_to_vals(fields, new, old)
@@ -64,28 +64,28 @@ Principal *old;
 {
   bzero((char *)new, sizeof(*new));
   if (IS_FIELD(KADM_NAME,fields)) {
-      (void) strncpy(new->name, old->name, ANAME_SZ); 
+      (void) strncpy(new->name, old->name, ANAME_SZ);
       SET_FIELD(KADM_NAME, new->fields);
   }
   if (IS_FIELD(KADM_INST,fields)) {
-      (void) strncpy(new->instance, old->instance, INST_SZ); 
+      (void) 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; 
+      new->exp_date   = old->exp_date;
       SET_FIELD(KADM_EXPDATE, new->fields);
-  }      
+  }
   if (IS_FIELD(KADM_ATTR,fields)) {
-    new->attributes = old->attributes; 
+    new->attributes = old->attributes;
       SET_FIELD(KADM_MAXLIFE, new->fields);
-  }      
+  }
   if (IS_FIELD(KADM_MAXLIFE,fields)) {
-    new->max_life   = old->max_life; 
+    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; 
+    new->key_low    = old->key_low;
+    new->key_high   = old->key_high;
     SET_FIELD(KADM_DESKEY, new->fields);
   }
 }
@@ -98,17 +98,17 @@ Kadm_vals *old;
 
   bzero((char *)new, sizeof(*new));
   if (IS_FIELD(KADM_NAME,fields))
-    (void) strncpy(new->name, old->name, ANAME_SZ); 
+    (void) strncpy(new->name, old->name, ANAME_SZ);
   if (IS_FIELD(KADM_INST,fields))
-    (void) strncpy(new->instance, old->instance, INST_SZ); 
+    (void) strncpy(new->instance, old->instance, INST_SZ);
   if (IS_FIELD(KADM_EXPDATE,fields))
-    new->exp_date   = old->exp_date; 
+    new->exp_date   = old->exp_date;
   if (IS_FIELD(KADM_ATTR,fields))
-    new->attributes = old->attributes; 
+    new->attributes = old->attributes;
   if (IS_FIELD(KADM_MAXLIFE,fields))
-    new->max_life   = old->max_life; 
+    new->max_life   = old->max_life;
   if (IS_FIELD(KADM_DESKEY,fields)) {
-    new->key_low    = old->key_low; 
-    new->key_high   = old->key_high; 
+    new->key_low    = old->key_low;
+    new->key_high   = old->key_high;
   }
 }
diff --git a/eBones/lib/libkdb/krb_cache.c b/eBones/lib/libkdb/krb_cache.c
index 4d8c594..8da1d7d 100644
--- a/eBones/lib/libkdb/krb_cache.c
+++ b/eBones/lib/libkdb/krb_cache.c
@@ -1,17 +1,17 @@
 /*
- * Copyright 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
  * <Copyright.MIT>.
  *
  * This is where a cache would be implemented, if it were necessary.
  *
  *	from: krb_cache.c,v 4.5 89/01/24 18:12:34 jon Exp $
- *	$Id: krb_cache.c,v 1.2 1994/07/19 19:23:35 g89r4222 Exp $
+ *	$Id: krb_cache.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: krb_cache.c,v 1.2 1994/07/19 19:23:35 g89r4222 Exp $";
+"$Id: krb_cache.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -34,7 +34,7 @@ extern long kerb_debug;
 static  init = 0;
 
 /*
- * initialization routine for cache 
+ * initialization routine for cache
  */
 
 int
@@ -45,7 +45,7 @@ kerb_cache_init()
 }
 
 /*
- * look up a principal in the cache returns number of principals found 
+ * look up a principal in the cache returns number of principals found
  */
 
 int
@@ -66,7 +66,7 @@ kerb_cache_get_principal(serv, inst, principal, max)
 	fprintf(stderr, "cache_get_principal for %s %s max = %d\n",
 	    serv, inst, max);
 #endif DEBUG
-    
+
 #ifdef DEBUG
     if (kerb_debug & 2) {
 	if (found) {
@@ -83,7 +83,7 @@ kerb_cache_get_principal(serv, inst, principal, max)
 
 /*
  * insert/replace a principal in the cache returns number of principals
- * inserted 
+ * inserted
  */
 
 int
@@ -106,13 +106,13 @@ kerb_cache_put_principal(principal, max)
 	    max);
     }
 #endif
-    
+
     for (i = 0; i < max; i++) {
 #ifdef DEBUG
 	if (kerb_debug & 2)
 	    fprintf(stderr, "\n %s %s",
 		    principal->name, principal->instance);
-#endif	
+#endif
 	/* DO IT */
 	count++;
 	principal++;
@@ -121,7 +121,7 @@ kerb_cache_put_principal(principal, max)
 }
 
 /*
- * look up a dba in the cache returns number of dbas found 
+ * look up a dba in the cache returns number of dbas found
  */
 
 int
@@ -158,7 +158,7 @@ kerb_cache_get_dba(serv, inst, dba, max)
 }
 
 /*
- * insert/replace a dba in the cache returns number of dbas inserted 
+ * insert/replace a dba in the cache returns number of dbas inserted
  */
 
 int
@@ -183,7 +183,7 @@ kerb_cache_put_dba(dba, max)
 	if (kerb_debug & 2)
 	    fprintf(stderr, "\n %s %s",
 		    dba->name, dba->instance);
-#endif	
+#endif
 	/* DO IT */
 	count++;
 	dba++;
diff --git a/eBones/lib/libkdb/krb_dbm.c b/eBones/lib/libkdb/krb_dbm.c
index 25ec48f..8bc283b 100644
--- a/eBones/lib/libkdb/krb_dbm.c
+++ b/eBones/lib/libkdb/krb_dbm.c
@@ -1,15 +1,15 @@
 /*
- * Copyright 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  *	from: krb_dbm.c,v 4.9 89/04/18 16:15:13 wesommer Exp $
- *	$Id: krb_dbm.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $
+ *	$Id: krb_dbm.c,v 1.2 1995/01/25 19:45:25 ache Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: krb_dbm.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $";
+"$Id: krb_dbm.c,v 1.2 1995/01/25 19:45:25 ache Exp $";
 #endif	lint
 
 #if defined(__FreeBSD__)
@@ -69,14 +69,14 @@ static int non_blocking = 0;
 
 /*
  * 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 
+ * 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
@@ -93,12 +93,12 @@ static int non_blocking = 0;
  * 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
@@ -140,7 +140,7 @@ static char *gen_dbsuffix(db_name, sfx)
     char *sfx;
 {
     char *dbsuffix;
-    
+
     if (sfx == NULL)
 	sfx = ".ok";
 
@@ -162,7 +162,7 @@ kerb_db_init()
 
 /*
  * gracefully shut down database--must be called by ANY program that does
- * a kerb_db_init 
+ * a kerb_db_init
  */
 
 kerb_db_fini()
@@ -201,7 +201,7 @@ long kerb_get_db_age()
     struct stat st;
     char *okname;
     long age;
-    
+
     okname = gen_dbsuffix(current_db_name, ".ok");
 
     if (stat (okname, &st) < 0)
@@ -226,7 +226,7 @@ static long kerb_start_update(db_name)
 {
     char *okname = gen_dbsuffix(db_name, ".ok");
     long age = kerb_get_db_age();
-    
+
     if (unlink(okname) < 0
 	&& errno != ENOENT) {
 	    age = -1;
@@ -243,7 +243,7 @@ static long kerb_end_update(db_name, age)
     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;
@@ -355,7 +355,7 @@ kerb_db_rename(from, to)
     char *fromok = gen_dbsuffix(from, ".ok");
     long trans = kerb_start_update(to);
     int ok;
-    
+
 #ifndef __FreeBSD__
     if ((rename (fromdir, todir) == 0)
 	&& (rename (frompag, topag) == 0)) {
@@ -384,7 +384,7 @@ kerb_db_rename(from, to)
 
 /*
  * look up a principal in the data base returns number of principals
- * found , and whether there were more than requested. 
+ * found , and whether there were more than requested.
  */
 
 kerb_db_get_principal(name, inst, principal, max, more)
@@ -627,7 +627,7 @@ delta_stat(a, b, c)
 
 /*
  * look up a dba in the data base returns number of dbas found , and
- * whether there were more than requested. 
+ * whether there were more than requested.
  */
 
 kerb_db_get_dba(dba_name, dba_inst, dba, max, more)
@@ -650,7 +650,7 @@ kerb_db_iterate (func, arg)
     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;
@@ -701,7 +701,7 @@ static int kerb_dbl_lock(mode)
     int     mode;
 {
     int flock_mode;
-    
+
     if (!inited)
 	kerb_dbl_init();
     if (mylock) {		/* Detect lock call when lock already
@@ -723,8 +723,8 @@ static int kerb_dbl_lock(mode)
     }
     if (non_blocking)
 	flock_mode |= LOCK_NB;
-    
-    if (flock(dblfd, flock_mode) < 0) 
+
+    if (flock(dblfd, flock_mode) < 0)
 	return errno;
     mylock++;
     return 0;
diff --git a/eBones/lib/libkdb/krb_kdb_utils.c b/eBones/lib/libkdb/krb_kdb_utils.c
index 5fccc53..c283e0f 100644
--- a/eBones/lib/libkdb/krb_kdb_utils.c
+++ b/eBones/lib/libkdb/krb_kdb_utils.c
@@ -10,12 +10,12 @@
  * Jon Rochlis, MIT Telecom, March 1988
  *
  *	from: krb_kdb_utils.c,v 4.1 89/07/26 11:01:12 jtkohl Exp $
- *	$Id: krb_kdb_utils.c,v 1.2 1994/07/19 19:23:38 g89r4222 Exp $
+ *	$Id: krb_kdb_utils.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: krb_kdb_utils.c,v 1.2 1994/07/19 19:23:38 g89r4222 Exp $";
+"$Id: krb_kdb_utils.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $";
 #endif	lint
 
 #include <des.h>
@@ -79,7 +79,7 @@ long kdb_verify_master_key (master_key, master_key_sched, out)
   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) 
+    if (out != (FILE *) NULL)
       fprintf(out,
 	      "verify_master_key: %s, %d found.\n",
 	      "Kerberos error on master key version lookup",
@@ -96,11 +96,11 @@ long kdb_verify_master_key (master_key, master_key_sched, out)
 
   /*
    * now use the master key to decrypt the key in the db, had better
-   * be the same! 
+   * be the same!
    */
   bcopy(&principal_data[0].key_low, key_from_db, 4);
   bcopy(&principal_data[0].key_high, ((long *) key_from_db) + 1, 4);
-  kdb_encrypt_key (key_from_db, key_from_db, 
+  kdb_encrypt_key (key_from_db, key_from_db,
 		   master_key, master_key_sched, DECRYPT);
 
   /* the decrypted database key had better equal the master key */
diff --git a/eBones/lib/libkdb/krb_lib.c b/eBones/lib/libkdb/krb_lib.c
index f0f1f6f..b90d1a5 100644
--- a/eBones/lib/libkdb/krb_lib.c
+++ b/eBones/lib/libkdb/krb_lib.c
@@ -1,16 +1,16 @@
 /*
- * $Source: /home/CVS/src/eBones/kdb/krb_lib.c,v $
- * $Author: g89r4222 $ 
+ * $Source: /home/ncvs/src/eBones/kdb/krb_lib.c,v $
+ * $Author: csgr $
  *
- * Copyright 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1988 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
+ * <mit-copyright.h>.
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: krb_lib.c,v 1.2 1994/07/19 19:23:39 g89r4222 Exp $";
+"$Id: krb_lib.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -37,7 +37,7 @@ extern char *getenv();
 static  init = 0;
 
 /*
- * initialization routine for data base 
+ * initialization routine for data base
  */
 
 int
@@ -64,7 +64,7 @@ kerb_init()
 /*
  * 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. 
+ * caches, if they're ever really implemented.
  */
 
 int
@@ -75,7 +75,7 @@ kerb_fini()
 
 /*
  * look up a principal in the cache or data base returns number of
- * principals found 
+ * principals found
  */
 
 int
@@ -99,10 +99,10 @@ kerb_get_principal(name, inst, principal, max, more)
 	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. 
+     * since the cache may not be exhaustive.
      */
 
     /* clear the principal area */
@@ -111,7 +111,7 @@ kerb_get_principal(name, inst, principal, max, more)
 #ifdef CACHE
     /*
      * so check to see if the name contains a wildcard "*" or "?", not
-     * preceeded by a backslash. 
+     * preceeded by a backslash.
      */
     wild = 0;
     if (index(name, '*') || index(name, '?') ||
@@ -206,7 +206,7 @@ kerb_get_dba(name, inst, dba, max, more)
 #endif
     /*
      * if this is a request including a wild card, have to go to db
-     * since the cache may not be exhaustive. 
+     * since the cache may not be exhaustive.
      */
 
     /* clear the dba area */
@@ -215,7 +215,7 @@ kerb_get_dba(name, inst, dba, max, more)
 #ifdef CACHE
     /*
      * so check to see if the name contains a wildcard "*" or "?", not
-     * preceeded by a backslash. 
+     * preceeded by a backslash.
      */
 
     wild = 0;
diff --git a/eBones/lib/libkdb/print_princ.c b/eBones/lib/libkdb/print_princ.c
index 730cfb7..d04ca39 100644
--- a/eBones/lib/libkdb/print_princ.c
+++ b/eBones/lib/libkdb/print_princ.c
@@ -1,15 +1,15 @@
 /*
- * Copyright 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
- *	from: $Header: /home/CVS/src/eBones/kdb/print_princ.c,v 1.2 1994/07/19 19:23:41 g89r4222 Exp $
- *	$Id: print_princ.c,v 1.2 1994/07/19 19:23:41 g89r4222 Exp $
+ *	from: $Header: /home/ncvs/src/eBones/kdb/print_princ.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $
+ *	$Id: print_princ.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: print_princ.c,v 1.2 1994/07/19 19:23:41 g89r4222 Exp $";
+"$Id: print_princ.c,v 1.1.1.1 1994/09/30 14:49:55 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
diff --git a/eBones/lib/libkrb/create_auth_reply.c b/eBones/lib/libkrb/create_auth_reply.c
index e47d4df..bfc3cfe 100644
--- a/eBones/lib/libkrb/create_auth_reply.c
+++ b/eBones/lib/libkrb/create_auth_reply.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: create_auth_reply.c,v 4.10 89/01/13 17:47:38 steiner Exp $
- *	$Id: create_auth_reply.c,v 1.2 1994/07/19 19:24:56 g89r4222 Exp $
+ *	$Id: create_auth_reply.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: create_auth_reply.c,v 1.2 1994/07/19 19:24:56 g89r4222 Exp $";
+"$Id: create_auth_reply.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -30,34 +30,34 @@ static char *rcsid =
  * 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
  */
 
diff --git a/eBones/lib/libkrb/create_ciph.c b/eBones/lib/libkrb/create_ciph.c
index c3bc0db..634d371 100644
--- a/eBones/lib/libkrb/create_ciph.c
+++ b/eBones/lib/libkrb/create_ciph.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: create_ciph.c,v 4.8 89/05/18 21:24:26 jis Exp $
- *	$Id: create_ciph.c,v 1.2 1994/07/19 19:24:58 g89r4222 Exp $
+ *	$Id: create_ciph.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: create_ciph.c,v 1.2 1994/07/19 19:24:58 g89r4222 Exp $";
+"$Id: create_ciph.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -30,24 +30,24 @@ static char *rcsid =
  * 			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
diff --git a/eBones/lib/libkrb/create_death_packet.c b/eBones/lib/libkrb/create_death_packet.c
index f747d6b..080e8a8 100644
--- a/eBones/lib/libkrb/create_death_packet.c
+++ b/eBones/lib/libkrb/create_death_packet.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: create_death_packet.c,v 4.9 89/01/17 16:05:59 rfrench Exp $
- *	$Id: create_death_packet.c,v 1.2 1994/07/19 19:24:59 g89r4222 Exp $
+ *	$Id: create_death_packet.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: create_death_packet.c,v 1.2 1994/07/19 19:24:59 g89r4222 Exp $";
+"$Id: create_death_packet.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -32,12 +32,12 @@ static char *rcsid =
  * ----			-----------		----
  *
  * 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
diff --git a/eBones/lib/libkrb/create_ticket.c b/eBones/lib/libkrb/create_ticket.c
index 984d8e9..95d5ced 100644
--- a/eBones/lib/libkrb/create_ticket.c
+++ b/eBones/lib/libkrb/create_ticket.c
@@ -1,16 +1,16 @@
-/* 
+/*
  * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
  * of Technology.
  * For copying and distribution information, please see the file
  * <Copyright.MIT>.
  *
  *	from: create_ticket.c,v 4.11 89/03/22 14:43:23 jtkohl Exp $
- *	$Id: create_ticket.c,v 1.2 1994/07/19 19:25:01 g89r4222 Exp $
+ *	$Id: create_ticket.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: create_ticket.c,v 1.2 1994/07/19 19:25:01 g89r4222 Exp $";
+"$Id: create_ticket.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif /* lint */
 
 #include <stdio.h>
@@ -35,35 +35,35 @@ static char rcsid[] =
  * 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
  *
  */
diff --git a/eBones/lib/libkrb/des_rw.c b/eBones/lib/libkrb/des_rw.c
index c958355..e5acb39 100644
--- a/eBones/lib/libkrb/des_rw.c
+++ b/eBones/lib/libkrb/des_rw.c
@@ -11,7 +11,7 @@
  * are met:
  * 1. Redistributions of source code must retain the entire comment,
  *    including the above copyright notice, this list of conditions
- *    and the following disclaimer, verbatim, at the beginning of 
+ *    and the following disclaimer, verbatim, at the beginning of
  *    the source file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: des_rw.c,v 1.5 1994/09/24 18:54:41 g89r4222 Exp $
+ * $Id: des_rw.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 /*
@@ -61,11 +61,11 @@
  *     +--+--+--+--+--+--+--+--+
  *     |  garbage     | data   |
  *     |                       |
- *     +-----------------------+----> des_pcbc_encrypt() --> 
+ *     +-----------------------+----> des_pcbc_encrypt() -->
  *
  * (Note that the length field sent before the actual message specifies
  * the number of data bytes, not the length of the entire padded message.
- * 
+ *
  * When data is read, if the message received is longer than the number
  * of bytes requested, then the remaining bytes are stored until the
  * following call to des_read().  If the number of bytes received is
@@ -160,7 +160,7 @@ int des_read(fd, buf, len)
 		stored -= len;
 		buff_ptr += len;
 		return(len);
-	} else { 
+	} else {
 		if (stored) {
 			bcopy(buff_ptr, buf, stored);
 			nreturned = stored;
@@ -184,11 +184,11 @@ int des_read(fd, buf, len)
 	if(nread != pad_length)
 		return(0);
 
-	des_pcbc_encrypt((des_cblock*) des_buff, (des_cblock*) buff_ptr, 
+	des_pcbc_encrypt((des_cblock*) des_buff, (des_cblock*) buff_ptr,
 		(msg_length < 8 ? 8 : msg_length),
 		key_sched, (des_cblock*) &des_key, DES_DECRYPT);
 
-	
+
 	if(msg_length < 8)
 		buff_ptr += (8 - msg_length);
 	stored = msg_length;
@@ -237,7 +237,7 @@ int des_write(fd, buf, len)
 
 		for(i = 0 ; i < 8 ; i+= sizeof(long)) {
 			rnd = random();
-			bcopy(&rnd, garbage+i, 
+			bcopy(&rnd, garbage+i,
 				(i <= (8 - sizeof(long)))?sizeof(long):(8-i));
 		}
 		bcopy(buf, garbage + 8 - len, len);
@@ -253,7 +253,7 @@ int des_write(fd, buf, len)
 
 
 	write_len = htonl(len);
-	if(write(fd, &write_len, sizeof(write_len)) != sizeof(write_len)) 
+	if(write(fd, &write_len, sizeof(write_len)) != sizeof(write_len))
 		return(-1);
 	if(write(fd, des_buff, pad_len) != pad_len)
 		return(-1);
diff --git a/eBones/lib/libkrb/dest_tkt.c b/eBones/lib/libkrb/dest_tkt.c
index 17c7855..6a06454 100644
--- a/eBones/lib/libkrb/dest_tkt.c
+++ b/eBones/lib/libkrb/dest_tkt.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: dest_tkt.c,v 4.9 89/10/02 16:23:07 jtkohl Exp $
- *	$Id: dest_tkt.c,v 1.2 1994/07/19 19:25:07 g89r4222 Exp $
+ *	$Id: dest_tkt.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: dest_tkt.c,v 1.2 1994/07/19 19:25:07 g89r4222 Exp $";
+"$Id: dest_tkt.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif /* lint */
 
 #include <stdio.h>
@@ -75,8 +75,8 @@ out:
     if (errno == ENOENT) return RET_TKFIL;
     else if (errno != 0) return KFAILURE;
 #ifdef TKT_SHMEM
-    /* 
-     * handle the shared memory case 
+    /*
+     * handle the shared memory case
      */
     (void) strcpy(shmidname, file);
     (void) strcat(shmidname, ".shm");
diff --git a/eBones/lib/libkrb/fgetst.c b/eBones/lib/libkrb/fgetst.c
index d938013..b855541 100644
--- a/eBones/lib/libkrb/fgetst.c
+++ b/eBones/lib/libkrb/fgetst.c
@@ -1,15 +1,15 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  *	from: fgetst.c,v 4.0 89/01/23 10:08:31 jtkohl Exp $
- *	$Id: fgetst.c,v 1.2 1994/07/19 19:25:10 g89r4222 Exp $
+ *	$Id: fgetst.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: fgetst.c,v 1.2 1994/07/19 19:25:10 g89r4222 Exp $";
+"$Id: fgetst.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif	/* lint */
 
 #include <stdio.h>
@@ -20,7 +20,7 @@ static char rcsid[] =
  * until it reads a null byte.  When finished, what has been read exists
  * in "s". If "count" characters were actually read, the last is changed
  * to a null, so the returned string is always null-terminated.  fgetst
- * returns the number of characters read, including the null terminator. 
+ * returns the number of characters read, including the null terminator.
  */
 
 fgetst(f, s, n)
diff --git a/eBones/lib/libkrb/get_ad_tkt.c b/eBones/lib/libkrb/get_ad_tkt.c
index d8e1283..1c14d3c 100644
--- a/eBones/lib/libkrb/get_ad_tkt.c
+++ b/eBones/lib/libkrb/get_ad_tkt.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_ad_tkt.c,v 4.15 89/07/07 15:18:51 jtkohl Exp $
- *	$Id: get_ad_tkt.c,v 1.2 1994/07/19 19:25:11 g89r4222 Exp $
+ *	$Id: get_ad_tkt.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: get_ad_tkt.c,v 1.2 1994/07/19 19:25:11 g89r4222 Exp $";
+"$Id: get_ad_tkt.c,v 1.1.1.1 1994/09/30 14:49:59 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -55,7 +55,7 @@ unsigned long rep_err_code;
  *
  * 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
@@ -106,12 +106,12 @@ get_ad_tkt(service,sinstance,realm,lifetime)
 
     /*
      * 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 
+     * 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("krbtgt",realm,lrealm,&cr)) != KSUCCESS) {
 	/*
 	 * If realm == lrealm, we have no hope, so let's not even try.
@@ -119,20 +119,20 @@ get_ad_tkt(service,sinstance,realm,lifetime)
 	if ((strncmp(realm, lrealm, REALM_SZ)) == 0)
 	    return(AD_NOTGT);
 	else{
-	    if ((kerror = 
+	    if ((kerror =
 		 get_ad_tkt("krbtgt",realm,lrealm,lifetime)) != KSUCCESS)
 		return(kerror);
 	    if ((kerror = krb_get_cred("krbtgt",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,"krbtgt",realm,lrealm,0L);
 
     if (kerror)
diff --git a/eBones/lib/libkrb/get_cred.c b/eBones/lib/libkrb/get_cred.c
index baf7ae2..6eb63f6 100644
--- a/eBones/lib/libkrb/get_cred.c
+++ b/eBones/lib/libkrb/get_cred.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_cred.c,v 4.10 89/05/31 17:46:22 jtkohl Exp $
- *	$Id: get_cred.c,v 1.2 1994/07/19 19:25:14 g89r4222 Exp $
+ *	$Id: get_cred.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: get_cred.c,v 1.2 1994/07/19 19:25:14 g89r4222 Exp $";
+"$Id: get_cred.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif /* lint */
 
 #include <stdio.h>
@@ -44,7 +44,7 @@ krb_get_cred(service,instance,realm,c)
 	return (tf_status);
 
     /* Search for requested service credentials and copy into c */
-       
+
     while ((tf_status = tf_get_cred(c)) == KSUCCESS) {
         /* Is this the right ticket? */
 	if ((strcmp(c->service,service) == 0) &&
diff --git a/eBones/lib/libkrb/get_in_tkt.c b/eBones/lib/libkrb/get_in_tkt.c
index 5fb1560..00fc57a 100644
--- a/eBones/lib/libkrb/get_in_tkt.c
+++ b/eBones/lib/libkrb/get_in_tkt.c
@@ -4,12 +4,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_in_tkt.c,v 4.12 89/07/18 16:32:56 jtkohl Exp $
- *	$Id: get_in_tkt.c,v 1.2 1994/07/19 19:25:16 g89r4222 Exp $
+ *	$Id: get_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: get_in_tkt.c,v 1.2 1994/07/19 19:25:16 g89r4222 Exp $";
+"$Id: get_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -69,7 +69,7 @@ static int passwd_to_key(user,instance,realm,passwd,key)
  * 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 
+ * 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.
@@ -86,8 +86,8 @@ krb_get_pw_in_tkt(user,instance,realm,service,sinstance,life,password)
 
 #ifdef NOENCRYPTION
 /*
- * $Source: /home/CVS/src/eBones/krb/get_in_tkt.c,v $
- * $Author: g89r4222 $
+ * $Source: /home/ncvs/src/eBones/krb/get_in_tkt.c,v $
+ * $Author: csgr $
  *
  * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
  * of Technology.
@@ -102,7 +102,7 @@ krb_get_pw_in_tkt(user,instance,realm,service,sinstance,life,password)
 
 #ifndef	lint
 static char rcsid_read_password_c[] =
-"Bones$Header: /home/CVS/src/eBones/krb/get_in_tkt.c,v 1.2 1994/07/19 19:25:16 g89r4222 Exp $";
+"Bones$Header: /home/ncvs/src/eBones/krb/get_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif	lint
 
 #include <des.h>
@@ -170,7 +170,7 @@ placebo_read_pw_string(s,max,prompt,verify)
 {
     int ok = 0;
     char *ptr;
-    
+
 #ifdef BSDUNIX
     jmp_buf old_env;
     struct sgttyb tty_state;
@@ -187,7 +187,7 @@ placebo_read_pw_string(s,max,prompt,verify)
 	goto lose;
 
     /* save terminal state*/
-    if (ioctl(0,TIOCGETP,&tty_state) == -1) 
+    if (ioctl(0,TIOCGETP,&tty_state) == -1)
 	return -1;
 
     push_signals();
diff --git a/eBones/lib/libkrb/get_krbhst.c b/eBones/lib/libkrb/get_krbhst.c
index 16c4ff2..bb1ea50 100644
--- a/eBones/lib/libkrb/get_krbhst.c
+++ b/eBones/lib/libkrb/get_krbhst.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_krbhst.c,v 4.8 89/01/22 20:00:29 rfrench Exp $
- *	$Id: get_krbhst.c,v 1.2 1994/07/19 19:25:17 g89r4222 Exp $
+ *	$Id: get_krbhst.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: get_krbhst.c,v 1.2 1994/07/19 19:25:17 g89r4222 Exp $";
+"$Id: get_krbhst.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif /* lint */
 
 #include <stdio.h>
@@ -33,7 +33,7 @@ static char *rcsid =
  *
  * The KRB_CONF file contains the name of the local realm in the first
  * line (not used by this routine), followed by lines indicating realm/host
- * entries.  The words "admin server" following the hostname indicate that 
+ * entries.  The words "admin server" following the hostname indicate that
  * the host provides an administrative database server.
  *
  * For example:
diff --git a/eBones/lib/libkrb/get_svc_in_tkt.c b/eBones/lib/libkrb/get_svc_in_tkt.c
index 6d9702f..0b0fe71 100644
--- a/eBones/lib/libkrb/get_svc_in_tkt.c
+++ b/eBones/lib/libkrb/get_svc_in_tkt.c
@@ -4,12 +4,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_svc_in_tkt.c,v 4.9 89/07/18 16:33:34 jtkohl Exp $
- *	$Id: get_svc_in_tkt.c,v 1.2 1994/07/19 19:25:26 g89r4222 Exp $
+ *	$Id: get_svc_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: get_svc_in_tkt.c,v 1.2 1994/07/19 19:25:26 g89r4222 Exp $";
+"$Id: get_svc_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -57,7 +57,7 @@ static int srvtab_to_key(user, instance, realm, srvtab, 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 
+ * 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.
diff --git a/eBones/lib/libkrb/get_tf_fullname.c b/eBones/lib/libkrb/get_tf_fullname.c
index 753ad1e..540e828 100644
--- a/eBones/lib/libkrb/get_tf_fullname.c
+++ b/eBones/lib/libkrb/get_tf_fullname.c
@@ -4,12 +4,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_tf_fullname.c,v 4.3 90/03/10 22:40:20 jon Exp $
- *	$Id: get_tf_fullname.c,v 1.2 1994/07/19 19:25:28 g89r4222 Exp $
+ *	$Id: get_tf_fullname.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: get_tf_fullname.c,v 1.2 1994/07/19 19:25:28 g89r4222 Exp $";
+"$Id: get_tf_fullname.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -22,10 +22,10 @@ static char rcsid[] =
  */
 
 /*
- * krb_get_tf_fullname() takes four arguments: the name of the 
+ * 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 
+ * 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().
  */
@@ -45,7 +45,7 @@ krb_get_tf_fullname(ticket_file, name, instance, realm)
     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)
@@ -59,8 +59,8 @@ krb_get_tf_fullname(ticket_file, name, instance, realm)
 	    return(KFAILURE);
 	else
 	    return(tf_status);
-    }    
+    }
     (void) tf_close();
-    
+
     return(tf_status);
 }
diff --git a/eBones/lib/libkrb/get_tf_realm.c b/eBones/lib/libkrb/get_tf_realm.c
index f405dcb..df2845e 100644
--- a/eBones/lib/libkrb/get_tf_realm.c
+++ b/eBones/lib/libkrb/get_tf_realm.c
@@ -4,12 +4,12 @@
  * <Copyright.MIT>.
  *
  *	from: get_tf_realm.c,v 4.2 90/01/02 13:40:19 jtkohl Exp $
- *	$Id: get_tf_realm.c,v 1.2 1994/07/19 19:25:30 g89r4222 Exp $
+ *	$Id: get_tf_realm.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: get_tf_realm.c,v 1.2 1994/07/19 19:25:30 g89r4222 Exp $";
+"$Id: get_tf_realm.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -21,9 +21,9 @@ static char rcsid[] =
  */
 
 /*
- * krb_get_tf_realm() takes two arguments: the name of a ticket 
+ * krb_get_tf_realm() takes two arguments: the name of a ticket
  * and a variable to store the name of the realm in.
- * 
+ *
  */
 
 krb_get_tf_realm(ticket_file, realm)
diff --git a/eBones/lib/libkrb/getrealm.c b/eBones/lib/libkrb/getrealm.c
index 96e9588..c850bd0 100644
--- a/eBones/lib/libkrb/getrealm.c
+++ b/eBones/lib/libkrb/getrealm.c
@@ -6,12 +6,12 @@
  * routine to convert hostname into realm name.
  *
  *	from: getrealm.c,v 4.6 90/01/02 13:35:56 jtkohl Exp $
- *	$Id: getrealm.c,v 1.2 1994/07/19 19:25:31 g89r4222 Exp $
+ *	$Id: getrealm.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: getrealm.c,v 1.2 1994/07/19 19:25:31 g89r4222 Exp $";
+"$Id: getrealm.c,v 1.1.1.1 1994/09/30 14:50:00 csgr Exp $";
 #endif	lint
 
 #include <strings.h>
@@ -92,7 +92,7 @@ char *host;
 			fclose(trans_file);
 			return(ret_realm);
 		}
-		if ((trans_host[0] == '.') && domain) { 
+		if ((trans_host[0] == '.') && domain) {
 			/* this is a domain match */
 			if (!strcasecmp(trans_host, domain)) {
 				/* domain match, save for later */
diff --git a/eBones/lib/libkrb/in_tkt.c b/eBones/lib/libkrb/in_tkt.c
index 53510da..5a05259 100644
--- a/eBones/lib/libkrb/in_tkt.c
+++ b/eBones/lib/libkrb/in_tkt.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: kt.c,v 4.9 89/10/25 19:03:35 qjb Exp $
- *	$Id: in_tkt.c,v 1.5 1994/09/24 14:30:09 g89r4222 Exp $
+ *	$Id: in_tkt.c,v 1.1.1.1 1994/09/30 14:50:01 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: in_tkt.c,v 1.5 1994/09/24 14:30:09 g89r4222 Exp $";
+"$Id: in_tkt.c,v 1.1.1.1 1994/09/30 14:50:01 csgr Exp $";
 #endif /* lint */
 
 #include <unistd.h>
@@ -73,7 +73,7 @@ in_tkt(pname,pinst)
 		    (void) close(fd);
 		    goto out;
 		}
-	    
+
 	    (void) fsync(fd);
 	    (void) close(fd);
 	}
diff --git a/eBones/lib/libkrb/krb_get_in_tkt.c b/eBones/lib/libkrb/krb_get_in_tkt.c
index a37bb60..af92bc6 100644
--- a/eBones/lib/libkrb/krb_get_in_tkt.c
+++ b/eBones/lib/libkrb/krb_get_in_tkt.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: der: krb_get_in_tkt.c,v 4.19 89/07/18 16:31:31 jtkohl Exp $
- *	$Id: krb_get_in_tkt.c,v 1.2 1994/07/19 19:25:47 g89r4222 Exp $
+ *	$Id: krb_get_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: krb_get_in_tkt.c,v 1.2 1994/07/19 19:25:47 g89r4222 Exp $";
+"$Id: krb_get_in_tkt.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -48,16 +48,16 @@ static int decrypt_tkt(user, instance, realm, arg, key_proc, cipp)
 #ifndef NOENCRYPTION
     /* Attempt to decrypt it */
 #endif
-    
+
     /* generate a key */
-    
+
     {
 	register int rc;
 	rc = (*key_proc)(user,instance,realm,arg,key);
 	if (rc)
 	    return(rc);
     }
-    
+
 #ifndef NOENCRYPTION
     key_sched(key,key_s);
     pcbc_encrypt((C_Block *)cip->dat,(C_Block *)cip->dat,
@@ -259,7 +259,7 @@ krb_get_in_tkt(user, instance, realm, service, sinstance, life,
     kvno = (unsigned char) ptr[1];
     tkt->length = (unsigned char) ptr[2];
     ptr += 3;
-    
+
     if ((tkt->length < 0) ||
 	((tkt->length + (ptr - (char *) cip->dat)) > cip->length))
 	return(INTK_BADPW);
diff --git a/eBones/lib/libkrb/kuserok.c b/eBones/lib/libkrb/kuserok.c
index cb1f708..404532d 100644
--- a/eBones/lib/libkrb/kuserok.c
+++ b/eBones/lib/libkrb/kuserok.c
@@ -7,12 +7,12 @@
  * access to a local account
  *
  *	from: kuserok.c,v 4.5 89/01/23 09:25:21 jtkohl Exp $
- *	$Id: kuserok.c,v 1.2 1994/07/19 19:25:50 g89r4222 Exp $
+ *	$Id: kuserok.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kuserok.c,v 1.2 1994/07/19 19:25:50 g89r4222 Exp $";
+"$Id: kuserok.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $";
 #endif	lint
 
 #include <krb.h>
@@ -60,9 +60,9 @@ static char rcsid[] =
  * The parmtable defines the keywords we will recognize with their
  * default values, and keeps a pointer to the found value.  The found
  * value should be filled in with strsave(), since FreeParameterSet()
- * will release memory for all non-NULL found strings. 
+ * will release memory for all non-NULL found strings.
  *
-*** NOTE WELL! *** 
+*** NOTE WELL! ***
  *
  * The table below is very nice, but we cannot hard-code a default for the
  * realm: we have to get the realm via krb_get_lrealm().  Even though the
@@ -70,7 +70,7 @@ static char rcsid[] =
  * kuserok to whatever krb_get_lrealm() tells us.  That code assumes that
  * the realm will be the entry number in the table below, so if you
  * change the order of the entries below, you have to change the
- * #definition of REALM_SCRIPT to reflect it. 
+ * #definition of REALM_SCRIPT to reflect it.
  */
 #define REALM_SUBSCRIPT 1
 parmtable kparm[] = {
@@ -113,7 +113,7 @@ kuserok(kdata, luser)
 	 * if he's trying to log in as himself, and there is no .klogin file,
 	 * let him.  To find out, call
 	 * krb_kntoln to convert the triple in kdata to a name which we can
-	 * string compare. 
+	 * string compare.
 	 */
 	if (!krb_kntoln(kdata, kuser) && (strcmp(kuser, luser) == 0)) {
 	    return(OK);
@@ -141,7 +141,7 @@ kuserok(kdata, luser)
 
     /*
      * change the default realm from the hard-coded value to the
-     * accepted realm that Kerberos specifies. 
+     * accepted realm that Kerberos specifies.
      */
     rc = krb_get_lrealm(local_realm, 1);
     if (rc == KSUCCESS)
diff --git a/eBones/lib/libkrb/mk_priv.c b/eBones/lib/libkrb/mk_priv.c
index 3bae4ed..3050cf4 100644
--- a/eBones/lib/libkrb/mk_priv.c
+++ b/eBones/lib/libkrb/mk_priv.c
@@ -16,12 +16,12 @@
  * Steve Miller    Project Athena  MIT/DEC
  *
  *	from: mk_priv.c,v 4.13 89/03/22 14:48:59 jtkohl Exp $
- *	$Id: mk_priv.c,v 1.2 1994/07/19 19:25:56 g89r4222 Exp $
+ *	$Id: mk_priv.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: mk_priv.c,v 1.2 1994/07/19 19:25:56 g89r4222 Exp $";
+"$Id: mk_priv.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $";
 #endif /* lint */
 
 /* system include files */
@@ -80,7 +80,7 @@ static long msg_time_sec;
 #ifndef NOENCRYPT
  * we encrypt from here with pcbc_encrypt
 #endif
- * 
+ *
  * 4 bytes		length			length of user data
  * length		in			user data
  * 1 byte		msg_time_5ms		timestamp milliseconds
@@ -154,15 +154,15 @@ long krb_mk_priv(in,out,length,schedule,key,sender,receiver)
      * 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 (lsb_net_ulong_less(sender->sin_addr.s_addr, /* src < recv */ 
-			  receiver->sin_addr.s_addr)==-1) 
-        msg_time_sec =  -msg_time_sec; 
-    else if (lsb_net_ulong_less(sender->sin_addr.s_addr, 
-				receiver->sin_addr.s_addr)==0) 
-        if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port) == -1) 
-            msg_time_sec = -msg_time_sec; 
+    /* For compatibility with broken old code, compares are done in VAX
+       byte order (LSBFIRST) */
+    if (lsb_net_ulong_less(sender->sin_addr.s_addr, /* src < recv */
+			  receiver->sin_addr.s_addr)==-1)
+        msg_time_sec =  -msg_time_sec;
+    else if (lsb_net_ulong_less(sender->sin_addr.s_addr,
+				receiver->sin_addr.s_addr)==0)
+        if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port) == -1)
+            msg_time_sec = -msg_time_sec;
     /* stuff time sec */
     bcopy((char *)&msg_time_sec,(char *)p,sizeof(msg_time_sec));
     p += sizeof(msg_time_sec);
diff --git a/eBones/lib/libkrb/mk_req.c b/eBones/lib/libkrb/mk_req.c
index bb0f097..fd31717 100644
--- a/eBones/lib/libkrb/mk_req.c
+++ b/eBones/lib/libkrb/mk_req.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: der: mk_req.c,v 4.17 89/07/07 15:20:35 jtkohl Exp $
- *	$Id: mk_req.c,v 1.2 1994/07/19 19:25:57 g89r4222 Exp $
+ *	$Id: mk_req.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: mk_req.c,v 1.2 1994/07/19 19:25:57 g89r4222 Exp $";
+"$Id: mk_req.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -95,14 +95,14 @@ krb_mk_req(authent,service,instance,realm,checksum)
     /* Get the ticket and move it into the authenticator */
     if (krb_ap_req_debug)
         printf("Realm: %s\n",realm);
-    /* 
+    /*
      * Determine realm of these tickets.  We will send this to the
      * KDC from which we are requesting tickets so it knows what to
      * with our session key.
      */
     if ((retval = krb_get_tf_realm(TKT_FILE, myrealm)) != KSUCCESS)
 	return(retval);
-    
+
     retval = krb_get_cred(service,instance,realm,&cr);
 
     if (retval == RET_NOTKT) {
@@ -177,10 +177,10 @@ krb_mk_req(authent,service,instance,realm,checksum)
     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.
  */
 
diff --git a/eBones/lib/libkrb/mk_safe.c b/eBones/lib/libkrb/mk_safe.c
index 567004b..46a80f7 100644
--- a/eBones/lib/libkrb/mk_safe.c
+++ b/eBones/lib/libkrb/mk_safe.c
@@ -15,12 +15,12 @@
  * Steve Miller    Project Athena  MIT/DEC
  *
  *	from: mk_safe.c,v 4.12 89/03/22 14:50:49 jtkohl Exp $
- *	$Id: mk_safe.c,v 1.2 1994/07/19 19:25:59 g89r4222 Exp $
+ *	$Id: mk_safe.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: mk_safe.c,v 1.2 1994/07/19 19:25:59 g89r4222 Exp $";
+"$Id: mk_safe.c,v 1.1.1.1 1994/09/30 14:50:02 csgr Exp $";
 #endif /* lint */
 
 /* system include files */
@@ -65,7 +65,7 @@ static long msg_time_sec;
  *			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
@@ -132,15 +132,15 @@ long krb_mk_safe(in,out,length,key,sender,receiver)
      * 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 (lsb_net_ulong_less(sender->sin_addr.s_addr, /* src < recv */ 
-			  receiver->sin_addr.s_addr)==-1) 
-        msg_time_sec =  -msg_time_sec; 
-    else if (lsb_net_ulong_less(sender->sin_addr.s_addr, 
-				receiver->sin_addr.s_addr)==0) 
-        if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port) == -1) 
-            msg_time_sec = -msg_time_sec; 
+    /* For compatibility with broken old code, compares are done in VAX
+       byte order (LSBFIRST) */
+    if (lsb_net_ulong_less(sender->sin_addr.s_addr, /* src < recv */
+			  receiver->sin_addr.s_addr)==-1)
+        msg_time_sec =  -msg_time_sec;
+    else if (lsb_net_ulong_less(sender->sin_addr.s_addr,
+				receiver->sin_addr.s_addr)==0)
+        if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port) == -1)
+            msg_time_sec = -msg_time_sec;
     /*
      * all that for one tiny bit!  Heaven help those that talk to
      * themselves.
diff --git a/eBones/lib/libkrb/rd_priv.c b/eBones/lib/libkrb/rd_priv.c
index 9adefec..0e3d906 100644
--- a/eBones/lib/libkrb/rd_priv.c
+++ b/eBones/lib/libkrb/rd_priv.c
@@ -15,12 +15,12 @@
  * Steve Miller    Project Athena  MIT/DEC
  *
  *	from: rd_priv.c,v 4.14 89/04/28 11:59:42 jtkohl Exp $
- *	$Id: rd_priv.c,v 1.2 1994/07/19 19:26:11 g89r4222 Exp $
+ *	$Id: rd_priv.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[]=
-"$Id: rd_priv.c,v 1.2 1994/07/19 19:26:11 g89r4222 Exp $";
+"$Id: rd_priv.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $";
 #endif /* lint */
 
 /* system include files */
@@ -154,17 +154,17 @@ long krb_rd_priv(in,in_length,schedule,key,sender,receiver,m_data)
     p += sizeof(m_data->time_sec);
 
     /* check direction bit is the sign bit */
-    /* For compatibility with broken old code, compares are done in VAX 
-       byte order (LSBFIRST) */ 
+    /* For compatibility with broken old code, compares are done in VAX
+       byte order (LSBFIRST) */
     if (lsb_net_ulong_less(sender->sin_addr.s_addr,
-			   receiver->sin_addr.s_addr)==-1) 
-	/* src < recv */ 
-	m_data->time_sec =  - m_data->time_sec; 
-    else if (lsb_net_ulong_less(sender->sin_addr.s_addr, 
-				receiver->sin_addr.s_addr)==0) 
+			   receiver->sin_addr.s_addr)==-1)
+	/* src < recv */
+	m_data->time_sec =  - m_data->time_sec;
+    else if (lsb_net_ulong_less(sender->sin_addr.s_addr,
+				receiver->sin_addr.s_addr)==0)
 	if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port)==-1)
 	    /* src < recv */
-	    m_data->time_sec =  - m_data->time_sec; 
+	    m_data->time_sec =  - m_data->time_sec;
     /*
      * all that for one tiny bit!
      * Heaven help those that talk to themselves.
diff --git a/eBones/lib/libkrb/rd_safe.c b/eBones/lib/libkrb/rd_safe.c
index e500b4d..3bfc490 100644
--- a/eBones/lib/libkrb/rd_safe.c
+++ b/eBones/lib/libkrb/rd_safe.c
@@ -13,12 +13,12 @@
  * Steve Miller    Project Athena  MIT/DEC
  *
  *	from: rd_safe.c,v 4.12 89/01/23 15:16:16 steiner Exp $
- *	$Id: rd_safe.c,v 1.2 1994/07/19 19:26:15 g89r4222 Exp $
+ *	$Id: rd_safe.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: rd_safe.c,v 1.2 1994/07/19 19:26:15 g89r4222 Exp $";
+"$Id: rd_safe.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $";
 #endif /* lint */
 
 /* system include files */
@@ -134,17 +134,17 @@ krb_rd_safe protocol err sizeof(u_long) != sizeof(struct in_addr)");
     p += sizeof(m_data->time_sec);
 
     /* check direction bit is the sign bit */
-    /* For compatibility with broken old code, compares are done in VAX 
-       byte order (LSBFIRST) */ 
+    /* For compatibility with broken old code, compares are done in VAX
+       byte order (LSBFIRST) */
     if (lsb_net_ulong_less(sender->sin_addr.s_addr,
-			   receiver->sin_addr.s_addr)==-1) 
-	/* src < recv */ 
-	m_data->time_sec =  - m_data->time_sec; 
-    else if (lsb_net_ulong_less(sender->sin_addr.s_addr, 
-				receiver->sin_addr.s_addr)==0) 
+			   receiver->sin_addr.s_addr)==-1)
+	/* src < recv */
+	m_data->time_sec =  - m_data->time_sec;
+    else if (lsb_net_ulong_less(sender->sin_addr.s_addr,
+				receiver->sin_addr.s_addr)==0)
 	if (lsb_net_ushort_less(sender->sin_port,receiver->sin_port)==-1)
 	    /* src < recv */
-	    m_data->time_sec =  - m_data->time_sec; 
+	    m_data->time_sec =  - m_data->time_sec;
 
     /*
      * All that for one tiny bit!  Heaven help those that talk to
diff --git a/eBones/lib/libkrb/read_service_key.c b/eBones/lib/libkrb/read_service_key.c
index 4d66710..c68a8fc 100644
--- a/eBones/lib/libkrb/read_service_key.c
+++ b/eBones/lib/libkrb/read_service_key.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: _service_key.c,v 4.10 90/03/10 19:06:56 jon Exp $
- *	$Id: read_service_key.c,v 1.2 1994/07/19 19:26:16 g89r4222 Exp $
+ *	$Id: read_service_key.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $
  */
 
 #ifndef lint
 static char *rcsid =
-"$Id: read_service_key.c,v 1.2 1994/07/19 19:26:16 g89r4222 Exp $";
+"$Id: read_service_key.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $";
 #endif /* lint */
 
 #include <krb.h>
@@ -26,7 +26,7 @@ static char *rcsid =
  * 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
@@ -102,7 +102,7 @@ read_service_key(service,instance,realm,kvno,file,key)
 	     strcmp(realm,"ATHENA.MIT.EDU")))
 	    continue;
 #else /* ! ATHENA_COMPAT */
-        if (strcmp(rlm,realm)) 
+        if (strcmp(rlm,realm))
 	    continue;
 #endif /* ATHENA_COMPAT */
 
diff --git a/eBones/lib/libkrb/recvauth.c b/eBones/lib/libkrb/recvauth.c
index fe26814..2ab364f 100644
--- a/eBones/lib/libkrb/recvauth.c
+++ b/eBones/lib/libkrb/recvauth.c
@@ -4,12 +4,12 @@
  * <Copyright.MIT>.
  *
  *	from: recvauth.c,v 4.4 90/03/10 19:03:08 jon Exp $";
- *	$Id: recvauth.c,v 1.2 1994/07/19 19:26:18 g89r4222 Exp $
+ *	$Id: recvauth.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: recvauth.c,v 1.2 1994/07/19 19:26:18 g89r4222 Exp $";
+"$Id: recvauth.c,v 1.1.1.1 1994/09/30 14:50:03 csgr Exp $";
 #endif	lint
 
 #include <krb.h>
@@ -214,7 +214,7 @@ char *version;			 /* version string (filled in) */
 	if (krb_net_read(fd, (char *)&tkt_len, sizeof(tkt_len)) !=
 	    sizeof(tkt_len))
 	    return(errno);
-    
+
 	/* sanity check */
 	ticket->length = ntohl((unsigned long)tkt_len);
 	if ((ticket->length <= 0) || (ticket->length > MAX_KTXT_LEN)) {
diff --git a/eBones/lib/libkrb/send_to_kdc.c b/eBones/lib/libkrb/send_to_kdc.c
index 59349c7..43f04a2 100644
--- a/eBones/lib/libkrb/send_to_kdc.c
+++ b/eBones/lib/libkrb/send_to_kdc.c
@@ -4,7 +4,7 @@
  * <Copyright.MIT>.
  *
  *	from: send_to_kdc.c,v 4.20 90/01/02 13:40:37 jtkohl Exp $
- *	$Id: send_to_kdc.c,v 1.2 1995/01/25 05:40:00 gibbs Exp $
+ *	$Id: send_to_kdc.c,v 1.3 1995/01/25 06:37:33 gibbs Exp $
  */
 
 #ifndef lint
@@ -257,7 +257,7 @@ static send_recv(pkt,rpkt,f,_to,addrs)
             printf("Sending message...");
         (void) fflush(stdout);
     }
-    if ((numsent = sendto(f,(char *)(pkt->dat), pkt->length, 0, 
+    if ((numsent = sendto(f,(char *)(pkt->dat), pkt->length, 0,
 			  (struct sockaddr *)_to,
                           S_AD_SZ)) != pkt->length) {
         if (krb_debug)
diff --git a/eBones/lib/libkrb/tf_shm.c b/eBones/lib/libkrb/tf_shm.c
index 5548f0d..f2f97ab 100644
--- a/eBones/lib/libkrb/tf_shm.c
+++ b/eBones/lib/libkrb/tf_shm.c
@@ -7,12 +7,12 @@
  * contributed by Dan Kolkowitz (kolk@jessica.stanford.edu).
  *
  *	from: tf_shm.c,v 4.2 89/10/25 23:26:46 qjb Exp $
- *	$Id: tf_shm.c,v 1.2 1994/07/19 19:26:26 g89r4222 Exp $
+ *	$Id: tf_shm.c,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: tf_shm.c,v 1.2 1994/07/19 19:26:26 g89r4222 Exp $";
+"$Id: tf_shm.c,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -51,15 +51,15 @@ char *file_name;
 					 don't slowly lose memory. */
 
     shmid = shmget((long)IPC_PRIVATE,MAX_BUFF, IPC_CREAT);
-    if (shmid == -1) { 
+    if (shmid == -1) {
 	if (krb_debug)
 	    perror("krb_shm_create shmget");
 	return(KFAILURE);		/* XXX */
     }
     me = getuid();
     metoo = geteuid();
-    /* 
-     * now set up the buffer so that we can modify it 
+    /*
+     * now set up the buffer so that we can modify it
      */
     shm_buf.shm_perm.uid = me;
     shm_buf.shm_perm.gid = getgid();
@@ -89,13 +89,13 @@ char *file_name;
 	    perror("krb_shm_create file");
 	(void) shmctl(shmid, IPC_RMID, 0);
 	return(KFAILURE);		/* XXX */
-    } 
+    }
     if (fchmod(fileno(sfile),0600) < 0) {
 	if (krb_debug)
 	    perror("krb_shm_create fchmod");
 	(void) shmctl(shmid, IPC_RMID, 0);
 	return(KFAILURE);		/* XXX */
-    }	
+    }
     if (me != metoo) {
 	if (setreuid(me, metoo) < 0) {
 	    /* can't switch??? barf! */
@@ -126,11 +126,11 @@ char *file_name;
 int krb_is_diskless()
 {
 	struct stat buf;
-	if (stat("/.diskless",&buf) < 0) 
+	if (stat("/.diskless",&buf) < 0)
 		return(0);
 	else return(1);
 }
-			
+
 /*
  * krb_shm_dest: destroy shared memory segment with session keys, and remove
  * file pointing to it.
@@ -156,7 +156,7 @@ char *file;
 			perror("krb_shm_dest: cannot delete shm segment");
 		    (void) fclose(sfile);
 		    return(KFAILURE);	/* XXX */
-		}		    
+		}
 	} else {
 	    if (krb_debug)
 		fprintf(stderr, "bad format in shmid file\n");
@@ -170,5 +170,5 @@ char *file;
 	return(RET_TKFIL);		/* XXX */
 }
 
-	
+
 
diff --git a/eBones/lib/libkrb/tf_util.c b/eBones/lib/libkrb/tf_util.c
index a9e8551..cb4908e 100644
--- a/eBones/lib/libkrb/tf_util.c
+++ b/eBones/lib/libkrb/tf_util.c
@@ -4,12 +4,12 @@
  * <Copyright.MIT>.
  *
  *	from: tf_util.c,v 4.9 90/03/10 19:19:45 jon Exp $
- *	$Id: tf_util.c,v 1.2 1994/07/19 19:26:28 g89r4222 Exp $
+ *	$Id: tf_util.c,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: tf_util.c,v 1.2 1994/07/19 19:26:28 g89r4222 Exp $";
+"$Id: tf_util.c,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $";
 #endif /* lint */
 
 #include <stdio.h>
@@ -51,7 +51,7 @@ char *shmat();
  *	   are invalid (ie. when deciding whether tf_init has been
  *	   called.)
  *	c. In tf_close, be sure it gets reinitialized to a negative
- *	   number. 
+ *	   number.
  */
 static  fd = -1;
 static	curpos;				/* Position in tfbfr */
@@ -109,13 +109,13 @@ static tf_gets(), tf_read();
 /*
  * 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. 
+ * 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. 
+ * shared.  If it's opened for writing, the lock is exclusive.
  *
- * Returns KSUCCESS if all went well, otherwise one of the following: 
+ * 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.
@@ -129,7 +129,7 @@ tf_init(tf_name, rw)
     uid_t   me, getuid();
     struct stat stat_buf;
 #ifdef TKT_SHMEM
-    char shmidname[MAXPATHLEN]; 
+    char shmidname[MAXPATHLEN];
     FILE *sfp;
     int shmid;
 #endif
@@ -170,7 +170,7 @@ tf_init(tf_name, rw)
      * 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. 
+     * proper error message.
      */
 
     curpos = sizeof(tfbfr);
@@ -214,7 +214,7 @@ tf_init(tf_name, rw)
     }
     tmp_shm_addr = krb_shm_addr;
 #endif /* TKT_SHMEM */
-    
+
     if (wflag) {
 	fd = open(tf_name, O_RDWR, 0600);
 	if (fd < 0) {
@@ -232,7 +232,7 @@ tf_init(tf_name, rw)
     }
     /*
      * Otherwise "wflag" is not set and the ticket file should be opened
-     * for read-only operations and locked for shared access. 
+     * for read-only operations and locked for shared access.
      */
 
     fd = open(tf_name, O_RDONLY, 0600);
@@ -256,7 +256,7 @@ tf_init(tf_name, rw)
  * 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. 
+ * was longer than ANAME_SZ, TKT_FIL_FMT is returned.
  */
 
 tf_get_pname(p)
@@ -279,7 +279,7 @@ tf_get_pname(p)
  * 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. 
+ * instance may be null.
  */
 
 tf_get_pinst(inst)
@@ -299,7 +299,7 @@ tf_get_pinst(inst)
  * 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: 
+ * KSUCCESS is returned.  Possible error codes are:
  *
  * TKT_FIL_INI  - tf_init wasn't called first
  * TKT_FIL_FMT  - bad format
@@ -394,7 +394,7 @@ tf_close()
  * 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. 
+ * in "s". If it encounters EOF or an error, it closes the ticket file.
  *
  * Possible return values are:
  *
@@ -408,7 +408,7 @@ tf_close()
  *		file is seriously ill.
  */
 
-static 
+static
 tf_gets(s, n)
     register char *s;
 {
@@ -455,7 +455,7 @@ tf_read(s, n)
     register n;
 {
     register count;
-    
+
     for (count = n; count > 0; --count) {
 	if (curpos >= sizeof(tfbfr)) {
 	    lastpos = read(fd, tfbfr, sizeof(tfbfr));
@@ -469,7 +469,7 @@ tf_read(s, n)
     }
     return n;
 }
-     
+
 char   *tkt_string();
 
 /*
diff --git a/eBones/libexec/registerd/registerd.c b/eBones/libexec/registerd/registerd.c
index b62e379..65a8a49 100644
--- a/eBones/libexec/registerd/registerd.c
+++ b/eBones/libexec/registerd/registerd.c
@@ -152,7 +152,7 @@ main(argc, argv)
 		    "couldn't read command code on Kerberos update");
 	}
 
-	code = (u_char) retval; 
+	code = (u_char) retval;
 	if (code != KSUCCESS) {
 		(void) sprintf(msgbuf, "%s", krb_err_txt[code]);
 		send_packet(msgbuf, RCRYPT);
diff --git a/eBones/libkadm/kadm.h b/eBones/libkadm/kadm.h
index 66284f4..965b530 100644
--- a/eBones/libkadm/kadm.h
+++ b/eBones/libkadm/kadm.h
@@ -1,7 +1,7 @@
 /*
- * $Source: /afs/athena.mit.edu/astaff/project/kerberos/src/include/RCS/kadm.h,v $
- * $Author: jtkohl $
- * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/include/RCS/kadm.h,v 4.2 89/09/26 09:15:20 jtkohl Exp 
+ * $Source: /home/ncvs/src/eBones/libkadm/kadm.h,v $
+ * $Author: wollman $
+ * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/include/RCS/kadm.h,v 4.2 89/09/26 09:15:20 jtkohl Exp
  *
  * Copyright 1988 by the Massachusetts Institute of Technology.
  *
diff --git a/eBones/libkadm/kadm_cli_wrap.c b/eBones/libkadm/kadm_cli_wrap.c
index ca20601..7e1cfa9 100644
--- a/eBones/libkadm/kadm_cli_wrap.c
+++ b/eBones/libkadm/kadm_cli_wrap.c
@@ -13,11 +13,11 @@ static char rcsid_kadm_cli_wrap_c[] =
 "from: Id: kadm_cli_wrap.c,v 4.6 89/12/30 20:09:45 qjb Exp";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: kadm_cli_wrap.c,v 1.1 1995/01/20 02:02:51 wollman Exp $";
 #endif	lint
 
 /*
- * kadm_cli_wrap.c the client side wrapping of the calls to the admin server 
+ * kadm_cli_wrap.c the client side wrapping of the calls to the admin server
  */
 
 #include <sys/types.h>
@@ -26,7 +26,7 @@ static const char rcsid[] =
 #include <netdb.h>
 #include <sys/socket.h>
 #include <kadm.h>
-#include <kadm_err.h> 
+#include <kadm_err.h>
 #include <krb_err.h>
 
 #ifndef NULL
@@ -42,7 +42,7 @@ static Kadm_Client client_parm;
 static des_cblock sess_key;	       /* to be filled in by kadm_cli_keyd */
 static Key_schedule sess_sched;
 
-static 
+static
 clear_secrets()
 {
 	bzero((char *)sess_key, sizeof(sess_key));
@@ -54,9 +54,9 @@ clear_secrets()
  * 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 
+ * 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
  */
 kadm_init_link(n, i, r)
 char n[];
@@ -94,11 +94,11 @@ char r[];
 
 /*
  * kadm_change_pw
- * recieves    : key 
+ * 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 
+ * by a user
  */
 kadm_change_pw(newkey)
 des_cblock newkey;		       /* The DES form of the users key */
@@ -126,7 +126,7 @@ des_cblock newkey;		       /* The DES form of the users key */
 	bcopy((char *) newkey, (char *) &keytmp, 4);
 	keytmp = htonl(keytmp);
 	stsize += vts_long(keytmp, &send_st, stsize);
-	
+
 	retc = kadm_cli_send(send_st, stsize, &ret_st, &ret_sz);
 	free((char *)send_st);
 	if (retc == KADM_SUCCESS) {
@@ -139,11 +139,11 @@ des_cblock newkey;		       /* The DES form of the users key */
 /*
  * kadm_add
  * 	receives    : vals
- * 	returns     : 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 
+ * the default values they are set to
  */
 kadm_add(vals)
 Kadm_vals *vals;
@@ -176,8 +176,8 @@ Kadm_vals *vals;
 /*
  * kadm_mod
  * 	receives    : KTEXT, {values, values}
- *	returns     : CKSUM,  RETCODE, {values} 
- *	acl         : su, sms (as register or dealloc) 
+ *	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
@@ -220,13 +220,13 @@ Kadm_vals *vals2;
 
 /*
  * kadm_get
- * 	receives   : KTEXT, {values, flags} 
+ * 	receives   : KTEXT, {values, flags}
  *	returns    : CKSUM, RETCODE, {count, values, values, values}
- *	acl        : su 
+ *	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 
+ * matches there were
  */
 kadm_get(vals, fl)
 Kadm_vals *vals;
@@ -265,7 +265,7 @@ u_char fl[4];
  * kadm_cli_send
  *	recieves   : opcode, packet, packet length, serv_name, serv_inst
  *	returns    : return code from the packet build, the server, or
- *			 something else 
+ *			 something else
  *
  * It assembles a packet as follows:
  *	 8 bytes    : VERSION STRING
@@ -273,11 +273,11 @@ u_char fl[4];
  *		    : 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. 
+ * then it sends the data and waits for a reply.
  */
 kadm_cli_send(st_dat, st_siz, ret_dat, ret_siz)
 u_char *st_dat;				/* the actual data */
diff --git a/eBones/libkadm/kadm_stream.c b/eBones/libkadm/kadm_stream.c
index c5990a0..6ceb02e 100644
--- a/eBones/libkadm/kadm_stream.c
+++ b/eBones/libkadm/kadm_stream.c
@@ -13,7 +13,7 @@ static char rcsid_kadm_stream_c[] =
 "Header: /afs/athena.mit.edu/astaff/project/kerberos/src/lib/kadm/RCS/kadm_stream.c,v 4.2 89/09/26 09:20:48 jtkohl Exp ";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: kadm_stream.c,v 1.1 1995/01/20 02:02:53 wollman Exp $";
 #endif	lint
 
 /*
@@ -32,11 +32,11 @@ static const char rcsid[] =
 
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 
-/* 
+/*
 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
 */
 vals_to_stream(dt_in, dt_out)
@@ -64,16 +64,16 @@ u_char **dt_out;
       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); 
+      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);
-}  
+}
 
 build_field_header(cont, st)
 u_char *cont;			/* container for fields data */
@@ -120,7 +120,7 @@ int loc;			/* offset into the stream for current data */
   return sizeof(u_long);
 }
 
-    
+
 vts_char(dat, st, loc)
 u_char dat;			/* the attributes field */
 u_char **st;			/* a base pointer to the stream */
@@ -130,12 +130,12 @@ int loc;			/* offset into the stream for current data */
   (*st)[loc] = (u_char) dat;
   return 1;
 }
-    
-/* 
+
+/*
 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
 */
 stream_to_vals(dt_in, dt_out, maxlen)
@@ -198,7 +198,7 @@ int maxlen;				/* max length to use */
 	  break;
       }
   return stsize;
-}  
+}
 
 check_field_header(st, cont, maxlen)
 u_char *st;			/* stream */
@@ -258,7 +258,7 @@ int maxlen;			/* maximum length of st */
   *dat = ntohl(temp);		/* convert to network order */
   return sizeof(u_long);
 }
-    
+
 stv_char(st, dat, loc, maxlen)
 u_char *st;			/* a base pointer to the stream */
 u_char *dat;			/* the attributes field */
diff --git a/eBones/libkadm/kadm_supp.c b/eBones/libkadm/kadm_supp.c
index df97f17..8b18621 100644
--- a/eBones/libkadm/kadm_supp.c
+++ b/eBones/libkadm/kadm_supp.c
@@ -13,7 +13,7 @@ static char rcsid_kadm_supp_c[] =
 "Header: /afs/athena.mit.edu/astaff/project/kerberos/src/lib/kadm/RCS/kadm_supp.c,v 4.1 89/09/26 09:21:07 jtkohl Exp ";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: kadm_supp.c,v 1.1 1995/01/20 02:02:54 wollman Exp $";
 #endif	lint
 
 /*
@@ -28,7 +28,7 @@ static const char rcsid[] =
 
 #include "kadm.h"
 #include "krb_db.h"
-    
+
 /*
 prin_vals:
   recieves    : a vals structure
@@ -37,7 +37,7 @@ prin_vals(vals)
 Kadm_vals *vals;
 {
    printf("Info in Database for %s.%s:\n", vals->name, vals->instance);
-   printf("   Max Life: %d   Exp Date: %s\n",vals->max_life, 
+   printf("   Max Life: %d   Exp Date: %s\n",vals->max_life,
 	  asctime(localtime((long *)&vals->exp_date)));
    printf("   Attribs: %.2x  key: %u %u\n",vals->attributes,
 	  vals->key_low, vals->key_high);
@@ -54,7 +54,7 @@ int s;
 #endif
 
 /* 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, 
+   it copies the fields in Principal specified by fields into Kadm_vals,
    i.e from old to new */
 
 kadm_prin_to_vals(fields, new, old)
@@ -64,28 +64,28 @@ Principal *old;
 {
   bzero((char *)new, sizeof(*new));
   if (IS_FIELD(KADM_NAME,fields)) {
-      (void) strncpy(new->name, old->name, ANAME_SZ); 
+      (void) strncpy(new->name, old->name, ANAME_SZ);
       SET_FIELD(KADM_NAME, new->fields);
   }
   if (IS_FIELD(KADM_INST,fields)) {
-      (void) strncpy(new->instance, old->instance, INST_SZ); 
+      (void) 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; 
+      new->exp_date   = old->exp_date;
       SET_FIELD(KADM_EXPDATE, new->fields);
-  }      
+  }
   if (IS_FIELD(KADM_ATTR,fields)) {
-    new->attributes = old->attributes; 
+    new->attributes = old->attributes;
       SET_FIELD(KADM_MAXLIFE, new->fields);
-  }      
+  }
   if (IS_FIELD(KADM_MAXLIFE,fields)) {
-    new->max_life   = old->max_life; 
+    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; 
+    new->key_low    = old->key_low;
+    new->key_high   = old->key_high;
     SET_FIELD(KADM_DESKEY, new->fields);
   }
 }
@@ -98,17 +98,17 @@ Kadm_vals *old;
 
   bzero((char *)new, sizeof(*new));
   if (IS_FIELD(KADM_NAME,fields))
-    (void) strncpy(new->name, old->name, ANAME_SZ); 
+    (void) strncpy(new->name, old->name, ANAME_SZ);
   if (IS_FIELD(KADM_INST,fields))
-    (void) strncpy(new->instance, old->instance, INST_SZ); 
+    (void) strncpy(new->instance, old->instance, INST_SZ);
   if (IS_FIELD(KADM_EXPDATE,fields))
-    new->exp_date   = old->exp_date; 
+    new->exp_date   = old->exp_date;
   if (IS_FIELD(KADM_ATTR,fields))
-    new->attributes = old->attributes; 
+    new->attributes = old->attributes;
   if (IS_FIELD(KADM_MAXLIFE,fields))
-    new->max_life   = old->max_life; 
+    new->max_life   = old->max_life;
   if (IS_FIELD(KADM_DESKEY,fields)) {
-    new->key_low    = old->key_low; 
-    new->key_high   = old->key_high; 
+    new->key_low    = old->key_low;
+    new->key_high   = old->key_high;
   }
 }
diff --git a/eBones/passwd/kpasswd.c b/eBones/passwd/kpasswd.c
index 708e677..2425bed 100644
--- a/eBones/passwd/kpasswd.c
+++ b/eBones/passwd/kpasswd.c
@@ -13,7 +13,7 @@ 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$";
+	"$Id: kpasswd.c,v 1.1 1995/01/20 22:14:14 wollman Exp $";
 #endif	lint
 
 /*
@@ -50,28 +50,28 @@ int krb_passwd(char *uname, char *iflag, char *rflag, char *uflag)
     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, 
+
+    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_name, "");
 	}
 	strcpy(default_inst, "");
 	if (krb_get_lrealm(default_realm, 1) != KSUCCESS)
@@ -108,7 +108,7 @@ int krb_passwd(char *uname, char *iflag, char *rflag, char *uflag)
     if(rflag) {
 	    if (k_isrealm(rflag)) {
 		    strncpy(realm, rflag, sizeof(realm) - 1);
-		    realm_given++; 
+		    realm_given++;
 	    } else {
 		    errx(1, "bad realm: %s", rflag);
 	    }
@@ -129,11 +129,11 @@ int krb_passwd(char *uname, char *iflag, char *rflag, char *uflag)
 
     (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) 
+
+    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.");
@@ -146,7 +146,7 @@ int krb_passwd(char *uname, char *iflag, char *rflag, char *uflag)
     (void) dest_tkt();
     if (status)
 	exit(2);
-    else 
+    else
 	exit(0);
 }
 
@@ -160,19 +160,19 @@ void get_pw_new_key(new_key, name, inst, realm, print_realm)
     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. 
+     * 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 : "");
@@ -181,7 +181,7 @@ void get_pw_new_key(new_key, name, inst, realm, print_realm)
 	exit(1);
     }
 
-    if ((status = krb_get_pw_in_tkt(name, inst, realm, PWSERV_NAME, 
+    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");
@@ -202,7 +202,7 @@ void get_pw_new_key(new_key, name, inst, realm, print_realm)
 	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;
diff --git a/eBones/registerd/registerd.c b/eBones/registerd/registerd.c
index b62e379..65a8a49 100644
--- a/eBones/registerd/registerd.c
+++ b/eBones/registerd/registerd.c
@@ -152,7 +152,7 @@ main(argc, argv)
 		    "couldn't read command code on Kerberos update");
 	}
 
-	code = (u_char) retval; 
+	code = (u_char) retval;
 	if (code != KSUCCESS) {
 		(void) sprintf(msgbuf, "%s", krb_err_txt[code]);
 		send_packet(msgbuf, RCRYPT);
diff --git a/eBones/usr.bin/kadmin/kadmin.c b/eBones/usr.bin/kadmin/kadmin.c
index 3d939bc..cbf4d6f 100644
--- a/eBones/usr.bin/kadmin/kadmin.c
+++ b/eBones/usr.bin/kadmin/kadmin.c
@@ -1,15 +1,15 @@
 /*
- * $Source: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadmin.c,v $
- * $Author: qjb $
+ * $Source: /home/ncvs/src/eBones/kadmin/kadmin.c,v $
+ * $Author: wollman $
  *
  * Copyright 1988 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see the file
  * Copyright.MIT.
  *
- * Kerberos database administrator's tool.  
- * 
- * The default behavior of kadmin is if the -m option is given 
+ * 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).
  * If you do not want this to be an available option, compile with
@@ -54,7 +54,7 @@ static char default_realm[REALM_SZ]; /* default kerberos realm */
 static char krbrlm[REALM_SZ];	/* current realm being administered */
 #ifndef NO_MULTIPLE
 static int multiple = 0;	/* Allow multiple requests per ticket */
-#endif 
+#endif
 
 main(argc, argv)
   int argc;
@@ -106,18 +106,18 @@ setvals(vals, string)
 	strcpy(realm, default_realm);
     if (strcmp(realm, krbrlm)) {
 	strcpy(krbrlm, realm);
-	if ((status = kadm_init_link(PWSERV_NAME, KRB_MASTER, krbrlm)) 
+	if ((status = kadm_init_link(PWSERV_NAME, KRB_MASTER, krbrlm))
 	    != KADM_SUCCESS)
-	    printf("kadm error for realm %s: %s\n", 
+	    printf("kadm error for realm %s: %s\n",
 		   krbrlm, error_message(status));
     }
-    if (status) 
+    if (status)
 	return 1;
     else
 	return KADM_SUCCESS;
-}    
+}
 
-void 
+void
 change_password(argc, argv)
     int     argc;
     char   *argv[];
@@ -145,7 +145,7 @@ change_password(argc, argv)
 
 	/* get the new password */
 	(void) sprintf(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);
@@ -163,13 +163,13 @@ change_password(argc, argv)
 	    clean_up();
 #endif
     }
-    else 
+    else
 	printf("kadmin: Principal does not exist.\n");
     return;
 }
 
 /*ARGSUSED*/
-void 
+void
 change_admin_password(argc, argv)
     int     argc;
     char   *argv[];
@@ -206,7 +206,7 @@ change_admin_password(argc, argv)
     return;
 }
 
-void 
+void
 add_new_key(argc, argv)
     int     argc;
     char   *argv[];
@@ -228,10 +228,10 @@ add_new_key(argc, argv)
 	/* get the admin's password */
 	if (get_admin_password() != GOOD_PW)
 	    return;
-	
+
 	/* get the new password */
 	(void) sprintf(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);
@@ -253,7 +253,7 @@ add_new_key(argc, argv)
     return;
 }
 
-void 
+void
 get_entry(argc, argv)
     int     argc;
     char   *argv[];
@@ -283,12 +283,12 @@ get_entry(argc, argv)
 	/* 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));
-	
+
 #ifndef NO_MULTIPLE
 	if (!multiple)
 	    clean_up();
@@ -300,7 +300,7 @@ get_entry(argc, argv)
 }
 
 
-void 
+void
 help(argc, argv)
     int     argc;
     char   *argv[];
@@ -435,18 +435,18 @@ do_init(argc, argv)
 #else
 #define OPTION_STRING "u:r:"
 #endif
-    
+
     bzero(myname, sizeof(myname));
 
     if (!inited) {
-	/* 
-	 * This is only as a default/initial realm; we don't care 
+	/*
+	 * This is only as a default/initial realm; we don't care
 	 * about failure.
 	 */
 	if (krb_get_lrealm(default_realm, 1) != KSUCCESS)
 	    strcpy(default_realm, KRB_REALM);
 
-	/* 
+	/*
 	 * If we can reach the local realm, initialize to it.  Otherwise,
 	 * don't initialize.
 	 */
@@ -455,7 +455,7 @@ do_init(argc, argv)
 	else
 	    strcpy(krbrlm, default_realm);
 
-	while ((c = getopt(argc, argv, OPTION_STRING)) != EOF) 
+	while ((c = getopt(argc, argv, OPTION_STRING)) != EOF)
 	    switch (c) {
 	      case 'u':
 		strncpy(myname, optarg, sizeof(myname) - 1);
@@ -508,9 +508,9 @@ get_admin_password()
 	/* If admin tickets exist and are valid, just exit. */
 	bzero(&c, 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 
+	     * tickets will probably last long enough for the next
 	     * transaction.
 	     */
 	    if (time(0) < (c.issue_date + (5 * 60 * c.lifetime) - FUDGE_VALUE))
@@ -518,14 +518,14 @@ get_admin_password()
 	ticket_life = DEFAULT_TKT_LIFE;
     }
 #endif
-    
+
     if (princ_exists(myname, "admin", krbrlm) != PE_NO) {
 	if (read_long_pw_string(admin_passwd, sizeof(admin_passwd)-1,
 				"Admin password:", 0)) {
 	    fprintf(stderr, "Error reading admin password.\n");
 	    goto bad;
 	}
-	status = krb_get_pw_in_tkt(myname, "admin", krbrlm, PWSERV_NAME, 
+	status = krb_get_pw_in_tkt(myname, "admin", krbrlm, PWSERV_NAME,
 				   KADM_SINST, ticket_life, admin_passwd);
 	bzero(admin_passwd, sizeof(admin_passwd));
     }
@@ -546,7 +546,7 @@ get_admin_password()
 		"while getting password tickets");
 	goto bad;
     }
-    
+
  bad:
     bzero(admin_passwd, sizeof(admin_passwd));
     (void) dest_tkt();
@@ -560,8 +560,8 @@ clean_up()
     return;
 }
 
-void 
-quit() 
+void
+quit()
 {
     printf("Cleaning up and exiting.\n");
     clean_up();
diff --git a/eBones/usr.bin/kdestroy/kdestroy.c b/eBones/usr.bin/kdestroy/kdestroy.c
index f010fcd..8a7cbb7 100644
--- a/eBones/usr.bin/kdestroy/kdestroy.c
+++ b/eBones/usr.bin/kdestroy/kdestroy.c
@@ -1,21 +1,21 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  * This program causes Kerberos tickets to be destroyed.
- * Options are: 
+ * Options are:
  *
  *   -q[uiet]	- no bell even if tickets not destroyed
- *   -f[orce]	- no message printed at all 
+ *   -f[orce]	- no message printed at all
  *
  *	from: kdestroy.c,v 4.5 88/03/18 15:16:02 steiner Exp $
- *	$Id: kdestroy.c,v 1.2 1994/07/19 19:24:16 g89r4222 Exp $
+ *	$Id: kdestroy.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kdestroy.c,v 1.2 1994/07/19 19:24:16 g89r4222 Exp $";
+"$Id: kdestroy.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
diff --git a/eBones/usr.bin/kinit/kinit.c b/eBones/usr.bin/kinit/kinit.c
index 94ce0fe..9f531d1 100644
--- a/eBones/usr.bin/kinit/kinit.c
+++ b/eBones/usr.bin/kinit/kinit.c
@@ -1,13 +1,13 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  * 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. 
+ * for the Kerberos ticket-granting service for future use.
  *
- * Options are: 
+ * Options are:
  *
  *   -i[instance]
  *   -r[realm]
@@ -15,12 +15,12 @@
  *   -l[ifetime]
  *
  *	from: kinit.c,v 4.12 90/03/20 16:11:15 jon Exp $
- *	$Id: kinit.c,v 1.2 1994/07/19 19:24:33 g89r4222 Exp $
+ *	$Id: kinit.c,v 1.1.1.1 1994/09/30 14:49:58 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kinit.c,v 1.2 1994/07/19 19:24:33 g89r4222 Exp $";
+"$Id: kinit.c,v 1.1.1.1 1994/09/30 14:49:58 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -151,7 +151,7 @@ main(argc, argv)
 				strncpy(aname, pwd->pw_name, sizeof(aname));
 		}
 	}
-		
+
 	if (!*aname)
 	    exit(0);
 	if (!k_isname(aname)) {
diff --git a/eBones/usr.bin/klist/klist.c b/eBones/usr.bin/klist/klist.c
index 4a95bc0..bfc3aa0 100644
--- a/eBones/usr.bin/klist/klist.c
+++ b/eBones/usr.bin/klist/klist.c
@@ -1,18 +1,18 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  * Lists your current Kerberos tickets.
  * Written by Bill Sommerfeld, MIT Project Athena.
  *
  *	from: klist.c,v 4.15 89/08/30 11:19:16 jtkohl Exp $
- *	$Id: klist.c,v 1.2 1994/07/19 19:24:38 g89r4222 Exp $
+ *	$Id: klist.c,v 1.1.1.1 1994/09/30 14:49:58 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: klist.c,v 1.2 1994/07/19 19:24:38 g89r4222 Exp $";
+"$Id: klist.c,v 1.1.1.1 1994/09/30 14:49:58 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -97,11 +97,11 @@ int tgt_test, long_form;
     if (long_form)
 	printf("Ticket file:	%s\n", file);
 
-    /* 
-     * Since krb_get_tf_realm will return a ticket_file error, 
+    /*
+     * 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 
+     * 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)
@@ -116,7 +116,7 @@ int tgt_test, long_form;
     /* Close ticket file */
     (void) 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
@@ -143,13 +143,13 @@ int tgt_test, long_form;
 	    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 
+     * 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%s%s%s%s\n\n", pname,
 	       (pinst[0] ? "." : ""), pinst,
@@ -218,7 +218,7 @@ char *file;
     int count;
 
     printf("Server key file:   %s\n", file);
-	
+
     if ((stab = open(file, O_RDONLY, 0400)) < 0) {
 	perror(file);
 	exit(1);
diff --git a/eBones/usr.bin/ksrvtgt/ksrvtgt.c b/eBones/usr.bin/ksrvtgt/ksrvtgt.c
index 46bbd56..79acf3e 100644
--- a/eBones/usr.bin/ksrvtgt/ksrvtgt.c
+++ b/eBones/usr.bin/ksrvtgt/ksrvtgt.c
@@ -1,18 +1,18 @@
 /*
- * Copyright 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  * Get a ticket-granting-ticket given a service key file (srvtab)
  * The lifetime is the shortest allowed [1 five-minute interval]
  *
  *	from: ksrvtgt.c,v 4.3 89/07/28 10:17:28 jtkohl Exp $
- *	$Id: ksrvtgt.c,v 1.2 1994/07/19 19:26:56 g89r4222 Exp $
+ *	$Id: ksrvtgt.c,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $
  */
 
 #ifndef lint
 const char rcsid[] =
-"$Id: ksrvtgt.c,v 1.2 1994/07/19 19:26:56 g89r4222 Exp $";
+"$Id: ksrvtgt.c,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $";
 #endif /* lint */
 
 #include <stdio.h>
@@ -36,10 +36,10 @@ main(argc,argv)
 		argv[0]);
 	exit(1);
     }
-    
+
     if (argc == 4)
 	(void) strncpy(srvtab, argv[3], sizeof(srvtab) -1);
-    
+
     if (argc == 5) {
 	(void) strncpy(realm, argv[3], sizeof(realm) - 1);
 	(void) strncpy(srvtab, argv[4], sizeof(srvtab) -1);
diff --git a/eBones/usr.bin/passwd/kpasswd.c b/eBones/usr.bin/passwd/kpasswd.c
index 708e677..2425bed 100644
--- a/eBones/usr.bin/passwd/kpasswd.c
+++ b/eBones/usr.bin/passwd/kpasswd.c
@@ -13,7 +13,7 @@ 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$";
+	"$Id: kpasswd.c,v 1.1 1995/01/20 22:14:14 wollman Exp $";
 #endif	lint
 
 /*
@@ -50,28 +50,28 @@ int krb_passwd(char *uname, char *iflag, char *rflag, char *uflag)
     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, 
+
+    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_name, "");
 	}
 	strcpy(default_inst, "");
 	if (krb_get_lrealm(default_realm, 1) != KSUCCESS)
@@ -108,7 +108,7 @@ int krb_passwd(char *uname, char *iflag, char *rflag, char *uflag)
     if(rflag) {
 	    if (k_isrealm(rflag)) {
 		    strncpy(realm, rflag, sizeof(realm) - 1);
-		    realm_given++; 
+		    realm_given++;
 	    } else {
 		    errx(1, "bad realm: %s", rflag);
 	    }
@@ -129,11 +129,11 @@ int krb_passwd(char *uname, char *iflag, char *rflag, char *uflag)
 
     (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) 
+
+    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.");
@@ -146,7 +146,7 @@ int krb_passwd(char *uname, char *iflag, char *rflag, char *uflag)
     (void) dest_tkt();
     if (status)
 	exit(2);
-    else 
+    else
 	exit(0);
 }
 
@@ -160,19 +160,19 @@ void get_pw_new_key(new_key, name, inst, realm, print_realm)
     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. 
+     * 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 : "");
@@ -181,7 +181,7 @@ void get_pw_new_key(new_key, name, inst, realm, print_realm)
 	exit(1);
     }
 
-    if ((status = krb_get_pw_in_tkt(name, inst, realm, PWSERV_NAME, 
+    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");
@@ -202,7 +202,7 @@ void get_pw_new_key(new_key, name, inst, realm, print_realm)
 	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;
diff --git a/eBones/usr.sbin/ext_srvtab/ext_srvtab.c b/eBones/usr.sbin/ext_srvtab/ext_srvtab.c
index 3a5dcec..093dfe2 100644
--- a/eBones/usr.sbin/ext_srvtab/ext_srvtab.c
+++ b/eBones/usr.sbin/ext_srvtab/ext_srvtab.c
@@ -1,13 +1,13 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  *
  *	from: ext_srvtab.c,v 4.1 89/07/18 16:49:30 jtkohl Exp $
- *	$Id: ext_srvtab.c,v 1.2 1994/07/19 19:22:36 g89r4222 Exp $
+ *	$Id: ext_srvtab.c,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: ext_srvtab.c,v 1.2 1994/07/19 19:22:36 g89r4222 Exp $";
+"$Id: ext_srvtab.c,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -39,12 +39,12 @@ main(argc, argv)
     int fopen_errs = 0;
     int arg;
     Principal princs[40];
-    int more; 
+    int more;
     int prompt = TRUE;
     register int n, i;
-    
+
     bzero(realm, sizeof(realm));
-    
+
     /* Parse commandline arguments */
     if (argc < 2)
 	usage();
@@ -57,7 +57,7 @@ main(argc, argv)
 		    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 -.
@@ -118,7 +118,7 @@ main(argc, argv)
 	    bcopy(&princs[i].key_low, session_key, sizeof(long));
 	    bcopy(&princs[i].key_high, session_key + sizeof(long),
 		  sizeof(long));
-	    kdb_encrypt_key (session_key, session_key, 
+	    kdb_encrypt_key (session_key, session_key,
 			     master_key, master_key_schedule, DES_DECRYPT);
 	    FWrite(session_key, sizeof session_key, 1, fout);
 	}
@@ -158,7 +158,7 @@ StampOutSecrets()
 
 usage()
 {
-    fprintf(stderr, 
+    fprintf(stderr,
 	    "Usage: %s [-n] [-r realm] instance [instance ...]\n", progname);
     exit(1);
 }
diff --git a/eBones/usr.sbin/kadmin/admin_server.c b/eBones/usr.sbin/kadmin/admin_server.c
index cca1aaf..7f04ff2 100644
--- a/eBones/usr.sbin/kadmin/admin_server.c
+++ b/eBones/usr.sbin/kadmin/admin_server.c
@@ -96,7 +96,7 @@ char *argv[];
 
     if (krbrlm[0] == 0)
 	if (krb_get_lrealm(krbrlm, 0) != KSUCCESS) {
-	    fprintf(stderr, 
+	    fprintf(stderr,
 		    "Unable to get local realm.  Fix krb.conf or use -r.\n");
 	    exit(1);
 	}
@@ -165,7 +165,7 @@ doexit()
     return(0);
 #endif /* POSIX */
 }
-   
+
 unsigned pidarraysize = 0;
 int *pidarray = (int *)0;
 
@@ -217,7 +217,7 @@ kadm_listen()
 	    if (errno != EINTR)
 		log("select: %s",error_message(errno));
 	    continue;
-	}      
+	}
 	if (FD_ISSET(admin_fd, &readfds)) {
 	    /* accept the conn */
 	    addrlen = sizeof(peer);
@@ -297,7 +297,7 @@ struct sockaddr_in *who;
       /* db locked */
       u_long retcode = KADM_DB_INUSE;
       char *pdat;
-      
+
       dat_len = KADM_VERSIZE + sizeof(u_long);
       dat = (u_char *) malloc((unsigned)dat_len);
       pdat = (char *) dat;
@@ -352,10 +352,10 @@ struct sockaddr_in *who;
 	}
 	if ((retval = kadm_ser_in(&dat,&dat_len)) != KADM_SUCCESS)
 	    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 = (u_short) dat_len;
 
@@ -364,13 +364,13 @@ struct sockaddr_in *who;
 	    abort();			/* XXX */
 	}
 	dlen = htons(dlen);
-    
+
 	if (krb_net_write(fd, (char *)&dlen, sizeof(u_short)) < 0) {
 	    log("writing dlen to client: %s",error_message(errno));
 	    (void) close(fd);
 	    cleanexit(6);
 	}
-    
+
 	if (krb_net_write(fd, (char *)dat, dat_len) < 0) {
 	    log(LOG_ERR, "writing to client: %s",error_message(errno));
 	    (void) close(fd);
@@ -435,7 +435,7 @@ kill_children()
 {
     register int i;
     int osigmask;
-    
+
     osigmask = sigblock(sigmask(SIGCHLD));
 
     for (i = 0; i < pidarraysize; i++) {
diff --git a/eBones/usr.sbin/kadmin/kadm_funcs.c b/eBones/usr.sbin/kadmin/kadm_funcs.c
index 585a834..9f06e30 100644
--- a/eBones/usr.sbin/kadmin/kadm_funcs.c
+++ b/eBones/usr.sbin/kadmin/kadm_funcs.c
@@ -13,7 +13,7 @@ static char rcsid_kadm_funcs_c[] =
 "Id: kadm_funcs.c,v 4.3 90/03/20 01:39:51 jon Exp ";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: kadm_funcs.c,v 1.1 1995/01/20 03:12:55 wollman Exp $";
 #endif	lint
 
 /*
@@ -40,7 +40,7 @@ enum acl_types acltype;
     extern char *acldir;
 
     (void) sprintf(checkname, "%s.%s@%s", pname, pinst, prealm);
-    
+
     switch (acltype) {
     case ADDACL:
 	(void) sprintf(filename, "%s%s", acldir, ADD_ACL_FILE);
@@ -85,7 +85,7 @@ Kadm_vals *valsout;
 	       rname, rinstance, rrealm, valsin->name, valsin->instance);
     return KADM_UNAUTH;
   }
-  
+
   /* Need to check here for "legal" name and instance */
   if (wildcard(valsin->name) || wildcard(valsin->instance)) {
       failadd(KADM_ILL_WILDCARD);
@@ -93,7 +93,7 @@ Kadm_vals *valsout;
 
   (void) log("request to add an entry for '%s.%s' from '%s.%s@%s'",
 		 valsin->name, valsin->instance, rname, rinstance, rrealm);
-  
+
   numfound = kerb_get_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST,
 				&default_princ, 1, &more);
   if (numfound == -1) {
@@ -111,7 +111,7 @@ Kadm_vals *valsout;
   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; 
+      data_i.max_life = default_princ.max_life;
 
   bzero((char *)&default_princ, sizeof(default_princ));
 
@@ -131,7 +131,7 @@ Kadm_vals *valsout;
   bzero((char *)newpw, sizeof(newpw));
 
   data_o = data_i;
-  numfound = kerb_get_principal(valsin->name, valsin->instance, 
+  numfound = kerb_get_principal(valsin->name, valsin->instance,
 				&data_o, 1, &more);
   if (numfound == -1) {
       failadd(KADM_DB_INUSE);
@@ -150,7 +150,7 @@ Kadm_vals *valsout;
     } else if (numfound) {
 	failadd(KADM_UK_SERROR);
     } else {
-      numfound = kerb_get_principal(valsin->name, valsin->instance, 
+      numfound = kerb_get_principal(valsin->name, valsin->instance,
 				    &data_o, 1, &more);
       if ((numfound!=1) || (more!=0)) {
 	  failadd(KADM_UK_RERROR);
@@ -183,22 +183,22 @@ Kadm_vals *valsout;			/* what data is there */
   int more;			/* To point to more name.instances */
   Principal data_o;		/* Data object to hold Principal */
 
-  
+
   if (!check_access(rname, rinstance, rrealm, GETACL)) {
     (void) log("WARNING: '%s.%s@%s' tried to get '%s.%s's entry",
 	    rname, rinstance, rrealm, valsin->name, valsin->instance);
     return KADM_UNAUTH;
   }
-  
+
   if (wildcard(valsin->name) || wildcard(valsin->instance)) {
       failget(KADM_ILL_WILDCARD);
   }
 
   (void) log("retrieve '%s.%s's entry for '%s.%s@%s'",
 	     valsin->name, valsin->instance, rname, rinstance, rrealm);
-  
+
   /* Look up the record in the database */
-  numfound = kerb_get_principal(valsin->name, valsin->instance, 
+  numfound = kerb_get_principal(valsin->name, valsin->instance,
 				&data_o, 1, &more);
   if (numfound == -1) {
       failget(KADM_DB_INUSE);
@@ -231,17 +231,17 @@ Kadm_vals *valsout;		/* the actual record which is returned */
   if (wildcard(valsin1->name) || wildcard(valsin1->instance)) {
       failmod(KADM_ILL_WILDCARD);
   }
-  
+
   if (!check_access(rname, rinstance, rrealm, MODACL)) {
     (void) log("WARNING: '%s.%s@%s' tried to change '%s.%s's entry",
 	       rname, rinstance, rrealm, valsin1->name, valsin1->instance);
     return KADM_UNAUTH;
   }
-  
+
   (void) log("request to modify '%s.%s's entry from '%s.%s@%s' ",
 	     valsin1->name, valsin1->instance, rname, rinstance, rrealm);
-  
-  numfound = kerb_get_principal(valsin1->name, valsin1->instance, 
+
+  numfound = kerb_get_principal(valsin1->name, valsin1->instance,
 				&data_o, 1, &more);
   if (numfound == -1) {
       failmod(KADM_DB_INUSE);
@@ -254,7 +254,7 @@ Kadm_vals *valsout;		/* the actual record which is returned */
       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; 
+	  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;
@@ -289,7 +289,7 @@ Kadm_vals *valsout;		/* the actual record which is returned */
       } else if (more) {
 	  failmod(KADM_UK_SERROR);
       } else {
-	  numfound = kerb_get_principal(valsin1->name, valsin1->instance, 
+	  numfound = kerb_get_principal(valsin1->name, valsin1->instance,
 					&data_o, 1, &more);
 	  if ((more!=0)||(numfound!=1)) {
 	      failmod(KADM_UK_RERROR);
@@ -335,14 +335,14 @@ des_cblock newpw;
   }
   (void) log("'%s.%s@%s' wants to change its password",
 	     rname, rinstance, rrealm);
-  
+
   bcopy(newpw, local_pw, 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, ENCRYPT);
 
-  numfound = kerb_get_principal(rname, rinstance, 
+  numfound = kerb_get_principal(rname, rinstance,
 				&data_o, 1, &more);
   if (numfound == -1) {
       failchange(KADM_DB_INUSE);
diff --git a/eBones/usr.sbin/kadmin/kadm_ser_wrap.c b/eBones/usr.sbin/kadmin/kadm_ser_wrap.c
index c019bc0..79196c6 100644
--- a/eBones/usr.sbin/kadmin/kadm_ser_wrap.c
+++ b/eBones/usr.sbin/kadmin/kadm_ser_wrap.c
@@ -12,7 +12,7 @@ static char rcsid_module_c[] =
 "BonesHeader: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_ser_wrap.c,v 4.4 89/09/26 09:29:36 jtkohl Exp ";
 #endif	lint
 
-/* 
+/*
 kadm_ser_wrap.c
 unwraps wrapped packets and calls the appropriate server subroutine
 */
@@ -28,7 +28,7 @@ unwraps wrapped packets and calls the appropriate server subroutine
 
 Kadm_Server server_parm;
 
-/* 
+/*
 kadm_ser_init
 set up the server_parm structure
 */
@@ -147,7 +147,7 @@ int *dat_len;
 #else
     des_key_sched(ad.session, sess_sched);
 #endif
-    if (retc = (int) krb_rd_priv(in_st, r_len, sess_sched, ad.session, 
+    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();
diff --git a/eBones/usr.sbin/kadmin/kadm_server.c b/eBones/usr.sbin/kadmin/kadm_server.c
index 56631d3..25a58be 100644
--- a/eBones/usr.sbin/kadmin/kadm_server.c
+++ b/eBones/usr.sbin/kadmin/kadm_server.c
@@ -15,7 +15,7 @@ static char rcsid_kadm_server_c[] =
 #include <kadm.h>
 #include <kadm_err.h>
 
-/* 
+/*
 kadm_ser_cpw - the server side of the change_password routine
   recieves    : KTEXT, {key}
   returns     : CKSUM, RETCODE
diff --git a/eBones/usr.sbin/kadmin/kadm_server.h b/eBones/usr.sbin/kadmin/kadm_server.h
index db9d21f..33b1904 100644
--- a/eBones/usr.sbin/kadmin/kadm_server.h
+++ b/eBones/usr.sbin/kadmin/kadm_server.h
@@ -1,7 +1,7 @@
 /*
- * $Source: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.h,v $
- * $Author: jtkohl $
- * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.h,v 4.1 89/12/21 17:46:51 jtkohl Exp 
+ * $Source: /home/ncvs/src/eBones/kadmind/kadm_server.h,v $
+ * $Author: wollman $
+ * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.h,v 4.1 89/12/21 17:46:51 jtkohl Exp
  *
  * Copyright 1988 by the Massachusetts Institute of Technology.
  *
diff --git a/eBones/usr.sbin/kadmind/admin_server.c b/eBones/usr.sbin/kadmind/admin_server.c
index cca1aaf..7f04ff2 100644
--- a/eBones/usr.sbin/kadmind/admin_server.c
+++ b/eBones/usr.sbin/kadmind/admin_server.c
@@ -96,7 +96,7 @@ char *argv[];
 
     if (krbrlm[0] == 0)
 	if (krb_get_lrealm(krbrlm, 0) != KSUCCESS) {
-	    fprintf(stderr, 
+	    fprintf(stderr,
 		    "Unable to get local realm.  Fix krb.conf or use -r.\n");
 	    exit(1);
 	}
@@ -165,7 +165,7 @@ doexit()
     return(0);
 #endif /* POSIX */
 }
-   
+
 unsigned pidarraysize = 0;
 int *pidarray = (int *)0;
 
@@ -217,7 +217,7 @@ kadm_listen()
 	    if (errno != EINTR)
 		log("select: %s",error_message(errno));
 	    continue;
-	}      
+	}
 	if (FD_ISSET(admin_fd, &readfds)) {
 	    /* accept the conn */
 	    addrlen = sizeof(peer);
@@ -297,7 +297,7 @@ struct sockaddr_in *who;
       /* db locked */
       u_long retcode = KADM_DB_INUSE;
       char *pdat;
-      
+
       dat_len = KADM_VERSIZE + sizeof(u_long);
       dat = (u_char *) malloc((unsigned)dat_len);
       pdat = (char *) dat;
@@ -352,10 +352,10 @@ struct sockaddr_in *who;
 	}
 	if ((retval = kadm_ser_in(&dat,&dat_len)) != KADM_SUCCESS)
 	    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 = (u_short) dat_len;
 
@@ -364,13 +364,13 @@ struct sockaddr_in *who;
 	    abort();			/* XXX */
 	}
 	dlen = htons(dlen);
-    
+
 	if (krb_net_write(fd, (char *)&dlen, sizeof(u_short)) < 0) {
 	    log("writing dlen to client: %s",error_message(errno));
 	    (void) close(fd);
 	    cleanexit(6);
 	}
-    
+
 	if (krb_net_write(fd, (char *)dat, dat_len) < 0) {
 	    log(LOG_ERR, "writing to client: %s",error_message(errno));
 	    (void) close(fd);
@@ -435,7 +435,7 @@ kill_children()
 {
     register int i;
     int osigmask;
-    
+
     osigmask = sigblock(sigmask(SIGCHLD));
 
     for (i = 0; i < pidarraysize; i++) {
diff --git a/eBones/usr.sbin/kadmind/kadm_funcs.c b/eBones/usr.sbin/kadmind/kadm_funcs.c
index 585a834..9f06e30 100644
--- a/eBones/usr.sbin/kadmind/kadm_funcs.c
+++ b/eBones/usr.sbin/kadmind/kadm_funcs.c
@@ -13,7 +13,7 @@ static char rcsid_kadm_funcs_c[] =
 "Id: kadm_funcs.c,v 4.3 90/03/20 01:39:51 jon Exp ";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: kadm_funcs.c,v 1.1 1995/01/20 03:12:55 wollman Exp $";
 #endif	lint
 
 /*
@@ -40,7 +40,7 @@ enum acl_types acltype;
     extern char *acldir;
 
     (void) sprintf(checkname, "%s.%s@%s", pname, pinst, prealm);
-    
+
     switch (acltype) {
     case ADDACL:
 	(void) sprintf(filename, "%s%s", acldir, ADD_ACL_FILE);
@@ -85,7 +85,7 @@ Kadm_vals *valsout;
 	       rname, rinstance, rrealm, valsin->name, valsin->instance);
     return KADM_UNAUTH;
   }
-  
+
   /* Need to check here for "legal" name and instance */
   if (wildcard(valsin->name) || wildcard(valsin->instance)) {
       failadd(KADM_ILL_WILDCARD);
@@ -93,7 +93,7 @@ Kadm_vals *valsout;
 
   (void) log("request to add an entry for '%s.%s' from '%s.%s@%s'",
 		 valsin->name, valsin->instance, rname, rinstance, rrealm);
-  
+
   numfound = kerb_get_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST,
 				&default_princ, 1, &more);
   if (numfound == -1) {
@@ -111,7 +111,7 @@ Kadm_vals *valsout;
   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; 
+      data_i.max_life = default_princ.max_life;
 
   bzero((char *)&default_princ, sizeof(default_princ));
 
@@ -131,7 +131,7 @@ Kadm_vals *valsout;
   bzero((char *)newpw, sizeof(newpw));
 
   data_o = data_i;
-  numfound = kerb_get_principal(valsin->name, valsin->instance, 
+  numfound = kerb_get_principal(valsin->name, valsin->instance,
 				&data_o, 1, &more);
   if (numfound == -1) {
       failadd(KADM_DB_INUSE);
@@ -150,7 +150,7 @@ Kadm_vals *valsout;
     } else if (numfound) {
 	failadd(KADM_UK_SERROR);
     } else {
-      numfound = kerb_get_principal(valsin->name, valsin->instance, 
+      numfound = kerb_get_principal(valsin->name, valsin->instance,
 				    &data_o, 1, &more);
       if ((numfound!=1) || (more!=0)) {
 	  failadd(KADM_UK_RERROR);
@@ -183,22 +183,22 @@ Kadm_vals *valsout;			/* what data is there */
   int more;			/* To point to more name.instances */
   Principal data_o;		/* Data object to hold Principal */
 
-  
+
   if (!check_access(rname, rinstance, rrealm, GETACL)) {
     (void) log("WARNING: '%s.%s@%s' tried to get '%s.%s's entry",
 	    rname, rinstance, rrealm, valsin->name, valsin->instance);
     return KADM_UNAUTH;
   }
-  
+
   if (wildcard(valsin->name) || wildcard(valsin->instance)) {
       failget(KADM_ILL_WILDCARD);
   }
 
   (void) log("retrieve '%s.%s's entry for '%s.%s@%s'",
 	     valsin->name, valsin->instance, rname, rinstance, rrealm);
-  
+
   /* Look up the record in the database */
-  numfound = kerb_get_principal(valsin->name, valsin->instance, 
+  numfound = kerb_get_principal(valsin->name, valsin->instance,
 				&data_o, 1, &more);
   if (numfound == -1) {
       failget(KADM_DB_INUSE);
@@ -231,17 +231,17 @@ Kadm_vals *valsout;		/* the actual record which is returned */
   if (wildcard(valsin1->name) || wildcard(valsin1->instance)) {
       failmod(KADM_ILL_WILDCARD);
   }
-  
+
   if (!check_access(rname, rinstance, rrealm, MODACL)) {
     (void) log("WARNING: '%s.%s@%s' tried to change '%s.%s's entry",
 	       rname, rinstance, rrealm, valsin1->name, valsin1->instance);
     return KADM_UNAUTH;
   }
-  
+
   (void) log("request to modify '%s.%s's entry from '%s.%s@%s' ",
 	     valsin1->name, valsin1->instance, rname, rinstance, rrealm);
-  
-  numfound = kerb_get_principal(valsin1->name, valsin1->instance, 
+
+  numfound = kerb_get_principal(valsin1->name, valsin1->instance,
 				&data_o, 1, &more);
   if (numfound == -1) {
       failmod(KADM_DB_INUSE);
@@ -254,7 +254,7 @@ Kadm_vals *valsout;		/* the actual record which is returned */
       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; 
+	  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;
@@ -289,7 +289,7 @@ Kadm_vals *valsout;		/* the actual record which is returned */
       } else if (more) {
 	  failmod(KADM_UK_SERROR);
       } else {
-	  numfound = kerb_get_principal(valsin1->name, valsin1->instance, 
+	  numfound = kerb_get_principal(valsin1->name, valsin1->instance,
 					&data_o, 1, &more);
 	  if ((more!=0)||(numfound!=1)) {
 	      failmod(KADM_UK_RERROR);
@@ -335,14 +335,14 @@ des_cblock newpw;
   }
   (void) log("'%s.%s@%s' wants to change its password",
 	     rname, rinstance, rrealm);
-  
+
   bcopy(newpw, local_pw, 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, ENCRYPT);
 
-  numfound = kerb_get_principal(rname, rinstance, 
+  numfound = kerb_get_principal(rname, rinstance,
 				&data_o, 1, &more);
   if (numfound == -1) {
       failchange(KADM_DB_INUSE);
diff --git a/eBones/usr.sbin/kadmind/kadm_ser_wrap.c b/eBones/usr.sbin/kadmind/kadm_ser_wrap.c
index c019bc0..79196c6 100644
--- a/eBones/usr.sbin/kadmind/kadm_ser_wrap.c
+++ b/eBones/usr.sbin/kadmind/kadm_ser_wrap.c
@@ -12,7 +12,7 @@ static char rcsid_module_c[] =
 "BonesHeader: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_ser_wrap.c,v 4.4 89/09/26 09:29:36 jtkohl Exp ";
 #endif	lint
 
-/* 
+/*
 kadm_ser_wrap.c
 unwraps wrapped packets and calls the appropriate server subroutine
 */
@@ -28,7 +28,7 @@ unwraps wrapped packets and calls the appropriate server subroutine
 
 Kadm_Server server_parm;
 
-/* 
+/*
 kadm_ser_init
 set up the server_parm structure
 */
@@ -147,7 +147,7 @@ int *dat_len;
 #else
     des_key_sched(ad.session, sess_sched);
 #endif
-    if (retc = (int) krb_rd_priv(in_st, r_len, sess_sched, ad.session, 
+    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();
diff --git a/eBones/usr.sbin/kadmind/kadm_server.c b/eBones/usr.sbin/kadmind/kadm_server.c
index 56631d3..25a58be 100644
--- a/eBones/usr.sbin/kadmind/kadm_server.c
+++ b/eBones/usr.sbin/kadmind/kadm_server.c
@@ -15,7 +15,7 @@ static char rcsid_kadm_server_c[] =
 #include <kadm.h>
 #include <kadm_err.h>
 
-/* 
+/*
 kadm_ser_cpw - the server side of the change_password routine
   recieves    : KTEXT, {key}
   returns     : CKSUM, RETCODE
diff --git a/eBones/usr.sbin/kadmind/kadm_server.h b/eBones/usr.sbin/kadmind/kadm_server.h
index db9d21f..33b1904 100644
--- a/eBones/usr.sbin/kadmind/kadm_server.h
+++ b/eBones/usr.sbin/kadmind/kadm_server.h
@@ -1,7 +1,7 @@
 /*
- * $Source: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.h,v $
- * $Author: jtkohl $
- * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.h,v 4.1 89/12/21 17:46:51 jtkohl Exp 
+ * $Source: /home/ncvs/src/eBones/kadmind/kadm_server.h,v $
+ * $Author: wollman $
+ * Header: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.h,v 4.1 89/12/21 17:46:51 jtkohl Exp
  *
  * Copyright 1988 by the Massachusetts Institute of Technology.
  *
diff --git a/eBones/usr.sbin/kdb_edit/kdb_edit.c b/eBones/usr.sbin/kdb_edit/kdb_edit.c
index 4c02db6..438317f 100644
--- a/eBones/usr.sbin/kdb_edit/kdb_edit.c
+++ b/eBones/usr.sbin/kdb_edit/kdb_edit.c
@@ -5,19 +5,19 @@
  * <Copyright.MIT>.
  *
  * This routine changes the Kerberos encryption keys for principals,
- * i.e., users or services. 
+ * i.e., users or services.
  *
  *	from: kdb_edit.c,v 4.2 90/01/09 16:05:09 raeburn Exp $
- *	$Id: kdb_edit.c,v 1.3 1994/09/09 21:43:46 g89r4222 Exp $
+ *	$Id: kdb_edit.c,v 1.1.1.1 1994/09/30 14:49:56 csgr Exp $
  */
 
 /*
- * exit returns 	 0 ==> success -1 ==> error 
+ * exit returns 	 0 ==> success -1 ==> error
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kdb_edit.c,v 1.3 1994/09/09 21:43:46 g89r4222 Exp $";
+"$Id: kdb_edit.c,v 1.1.1.1 1994/09/30 14:49:56 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -158,7 +158,7 @@ main(argc, argv)
 
 #endif
 
-    if (kdb_get_master_key ((nflag == 0), 
+    if (kdb_get_master_key ((nflag == 0),
 			    master_key, master_key_schedule) != 0) {
       fprintf (stdout, "Couldn't read master key.\n");
       fflush (stdout);
@@ -241,7 +241,7 @@ change_principal()
 	    if (!creating) {
 		/*
 		 * copy the existing data so we can use the old values
-		 * for the qualifier clause of the replace 
+		 * for the qualifier clause of the replace
 		 */
 		principal_data[i].old = (char *) &old_principal;
 		bcopy(&principal_data[i], &old_principal,
@@ -310,7 +310,7 @@ change_principal()
 		}
 
 		/* seal it under the kerberos master key */
-		kdb_encrypt_key (new_key, new_key, 
+		kdb_encrypt_key (new_key, new_key,
 				 master_key, master_key_schedule,
 				 ENCRYPT);
 		bcopy(new_key, &principal_data[i].key_low, 4);
@@ -398,7 +398,7 @@ change_principal()
 
 	    /*
 	     * remaining fields -- key versions and mod info, should
-	     * not be directly manipulated 
+	     * not be directly manipulated
 	     */
 	    if (changed) {
 		if (kerb_put_principal(&principal_data[i], 1)) {
diff --git a/eBones/usr.sbin/kdb_init/kdb_init.c b/eBones/usr.sbin/kdb_init/kdb_init.c
index dc7055e..7a8e32f 100644
--- a/eBones/usr.sbin/kdb_init/kdb_init.c
+++ b/eBones/usr.sbin/kdb_init/kdb_init.c
@@ -1,18 +1,18 @@
 /*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
+ * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
- * <Copyright.MIT>. 
+ * <Copyright.MIT>.
  *
  * program to initialize the database,  reports error if database file
- * already exists. 
+ * already exists.
  *
  *	from: kdb_init.c,v 4.0 89/01/24 21:50:45 jtkohl Exp $
- *	$Id: kdb_init.c,v 1.3 1994/09/24 14:04:17 g89r4222 Exp $
+ *	$Id: kdb_init.c,v 1.1.1.1 1994/09/30 14:49:56 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kdb_init.c,v 1.3 1994/09/24 14:04:17 g89r4222 Exp $";
+"$Id: kdb_init.c,v 1.1.1.1 1994/09/30 14:49:56 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -44,7 +44,7 @@ main(argc, argv)
     char   *cp;
     int code;
     char *database;
-    
+
     progname = (cp = rindex(*argv, '/')) ? cp + 1 : *argv;
 
     if (argc > 3) {
@@ -96,7 +96,7 @@ main(argc, argv)
 	add_principal(KERB_M_NAME, KERB_M_INST, MASTER_KEY) ||
 	add_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST, NULL_KEY) ||
 	add_principal("krbtgt", realm, RANDOM_KEY) ||
-	add_principal("changepw", KRB_MASTER, RANDOM_KEY) 
+	add_principal("changepw", KRB_MASTER, RANDOM_KEY)
 	) {
 	fprintf(stderr, "\n%s: couldn't initialize database.\n",
 		progname);
@@ -169,7 +169,7 @@ add_principal(name, instance, aap_op)
     principal.old = 0;
 
     kerb_db_put_principal(&principal, 1);
-    
+
     /* let's play it safe */
     bzero (new_key, sizeof (C_Block));
     bzero (&principal.key_low, 4);
diff --git a/eBones/usr.sbin/kdb_util/kdb_util.c b/eBones/usr.sbin/kdb_util/kdb_util.c
index 8465b5b..7bc8559 100644
--- a/eBones/usr.sbin/kdb_util/kdb_util.c
+++ b/eBones/usr.sbin/kdb_util/kdb_util.c
@@ -7,17 +7,17 @@
  * 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. 
+ * should happen with other processes shutdown.
  *
  * Written July 9, 1987 by Jeffrey I. Schiller
  *
  *	from: kdb_util.c,v 4.4 90/01/09 15:57:20 raeburn Exp $
- *	$Id: kdb_util.c,v 1.3 1994/09/24 14:04:21 g89r4222 Exp $
+ *	$Id: kdb_util.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kdb_util.c,v 1.3 1994/09/24 14:04:21 g89r4222 Exp $";
+"$Id: kdb_util.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -62,7 +62,7 @@ main(argc, argv)
     char *db_name;
 
     progname = prog;
-    
+
     if (argc != 3 && argc != 4) {
 	fprintf(stderr, "Usage: %s operation file-name [database name].\n",
 		argv[0]);
@@ -77,7 +77,7 @@ main(argc, argv)
 	perror("Can't open database");
 	exit(1);
     }
-    
+
     if (!strcmp(argv[1], "load"))
 	op = OP_LOAD;
     else if (!strcmp(argv[1], "dump"))
@@ -134,7 +134,7 @@ main(argc, argv)
       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);      
+      printf("Don't forget to do a `kdb_util load %s' to reload the database!\n", file_name);
       break;
     }
     exit(0);
@@ -148,7 +148,7 @@ clear_secrets ()
   bzero((char *)new_master_key_schedule, sizeof (Key_schedule));
 }
 
-/* cv_key is a procedure which takes a principle and changes its key, 
+/* 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). */
@@ -163,7 +163,7 @@ static int dump_db_1(arg, principal)
     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';
@@ -205,7 +205,7 @@ dump_db (db_file, output_file, cv_key)
 
     a.cv_key = cv_key;
     a.output_file = output_file;
-    
+
     kerb_db_iterate (dump_db_1, (char *)&a);
     return fflush(output_file);
 }
@@ -432,7 +432,7 @@ convert_old_format_db (db_file, out)
 
   /*
    * now use the master key to decrypt (old style) the key in the db, had better
-   * be the same! 
+   * be the same!
    */
   bcopy((char *)&principal_data[0].key_low, (char *)key_from_db, 4);
   bcopy((char *)&principal_data[0].key_high,
@@ -451,7 +451,7 @@ convert_old_format_db (db_file, out)
     fprintf(stderr, "does not match database.\n");
     exit (-1);
   }
-    
+
   fprintf(stderr, "Master key verified.\n");
   (void) fflush(stderr);
 
@@ -468,14 +468,14 @@ register char *cp;
     int local;
 
     zaptime(&tp);			/* clear out the struct */
-    
+
     if (strlen(cp) > 10) {		/* new format */
 	(void) strncpy(wbuf, cp, 4);
 	wbuf[4] = 0;
 	tp.tm_year = atoi(wbuf);
 	cp += 4;			/* step over the year */
 	local = 0;			/* GMT */
-    } else {				/* old format: local time, 
+    } else {				/* old format: local time,
 					   year is 2 digits, assuming 19xx */
 	wbuf[0] = *cp++;
 	wbuf[1] = *cp++;
@@ -492,11 +492,11 @@ register char *cp;
     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);
diff --git a/eBones/usr.sbin/kerberos/Makefile b/eBones/usr.sbin/kerberos/Makefile
index 7f36cf7..44853ef 100644
--- a/eBones/usr.sbin/kerberos/Makefile
+++ b/eBones/usr.sbin/kerberos/Makefile
@@ -1,9 +1,9 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.2 1994/07/19 19:24:22 g89r4222 Exp $
+#	$Id: Makefile,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $
 
 PROG=	kerberos
 SRCS=	kerberos.c cr_err_reply.c
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include 
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 NOMAN=	noman
diff --git a/eBones/usr.sbin/kerberos/cr_err_reply.c b/eBones/usr.sbin/kerberos/cr_err_reply.c
index 585fd03..c5178fe 100644
--- a/eBones/usr.sbin/kerberos/cr_err_reply.c
+++ b/eBones/usr.sbin/kerberos/cr_err_reply.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: cr_err_reply.c,v 4.10 89/01/10 11:34:42 steiner Exp $
- *	$Id: cr_err_reply.c,v 1.1 1994/07/19 19:24:24 g89r4222 Exp $
+ *	$Id: cr_err_reply.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: cr_err_reply.c,v 1.1 1994/07/19 19:24:24 g89r4222 Exp $";
+"$Id: cr_err_reply.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $";
 #endif /* lint */
 
 #include <sys/types.h>
@@ -30,28 +30,28 @@ extern int req_act_vno;		/* this is defined in the kerberos
  * 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
  */
 
diff --git a/eBones/usr.sbin/kerberos/kerberos.c b/eBones/usr.sbin/kerberos/kerberos.c
index b980577..a7f391c 100644
--- a/eBones/usr.sbin/kerberos/kerberos.c
+++ b/eBones/usr.sbin/kerberos/kerberos.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: kerberos.c,v 4.19 89/11/01 17:18:07 qjb Exp $
- *	$Id: kerberos.c,v 1.3 1994/09/09 21:43:51 g89r4222 Exp $
+ *	$Id: kerberos.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: kerberos.c,v 1.3 1994/09/09 21:43:51 g89r4222 Exp $";
+"$Id: kerberos.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $";
 #endif  lint
 
 #include <stdio.h>
@@ -97,7 +97,7 @@ static void hang();
  */
 static void usage()
 {
-    fprintf(stderr, "Usage: %s [-s] [-m] [-n] [-p pause_seconds]%s%s\n", progname, 
+    fprintf(stderr, "Usage: %s [-s] [-m] [-n] [-p pause_seconds]%s%s\n", progname,
 	    " [-a max_age] [-l log_file] [-r realm]"
 	    ," [database_pathname]"
 	    );
@@ -160,7 +160,7 @@ main(argc, argv)
 	    break;
 	case 'a':
 	    /* Set max age. */
-	    if (!isdigit(optarg[0])) 
+	    if (!isdigit(optarg[0]))
 		usage();
 	    max_age = atoi(optarg);
 	    if ((max_age < ONE_HOUR) || (max_age > THREE_DAYS)) {
@@ -194,9 +194,9 @@ main(argc, argv)
 
     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)
@@ -205,12 +205,12 @@ main(argc, argv)
 	printf("\tSleep forever on error\n");
     if (mflag)
 	printf("\tMaster key will be entered manually\n");
-    
+
     printf("\tLog file is %s\n", lflag ? log_file : KRBLOG);
 
     if (lflag)
 	kset_logfile(log_file);
-    
+
     /* find our hostname, and use it as the instance */
     if (gethostname(k_instance, INST_SZ)) {
 	fprintf(stderr, "%s: gethostname error\n", progname);
@@ -249,7 +249,7 @@ main(argc, argv)
 
     /* 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");
@@ -449,7 +449,7 @@ kerberos(client, pkt)
 
 	    /*
 	     * get the user's key, unseal it from the server's key, and
-	     * use it to seal the cipher 
+	     * use it to seal the cipher
 	     */
 
 	    /* a_name_data.key_low a_name_data.key_high */
@@ -457,7 +457,7 @@ kerberos(client, pkt)
 	    bcopy(&a_name_data.key_high, ((long *) key) + 1, 4);
 
 	    /* unseal the a_name key from the master key */
-	    kdb_encrypt_key(key, key, master_key, 
+	    kdb_encrypt_key(key, key, master_key,
 			    master_key_schedule, DECRYPT);
 
 	    create_ciph(ciph, session_key, s_name_data.name,
@@ -616,10 +616,10 @@ kerberos(client, pkt)
 
 
 /*
- * setup_disc 
+ * setup_disc
  *
  * disconnect all descriptors, remove ourself from the process
- * group that spawned us. 
+ * group that spawned us.
  */
 
 setup_disc()
@@ -648,7 +648,7 @@ setup_disc()
 
 /*
  * kerb_er_reply creates an error reply packet and sends it to the
- * client. 
+ * client.
  */
 
 kerb_err_reply(client, pkt, err, string)
@@ -680,7 +680,7 @@ kerb_err_reply(client, pkt, err, string)
 static void check_db_age()
 {
     long age;
-    
+
     if (max_age != -1) {
 	/* Requires existance of kerb_get_db_age() */
 	gettimeofday(&kerb_time, 0);
@@ -712,16 +712,16 @@ check_princ(p_name, instance, lifetime, p)
     klog(L_ALL_REQ,
 	 "Principal: \"%s\", Instance: \"%s\" Lifetime = %d n = %d",
 	 p_name, instance, lifetime, n, 0);
-    
+
     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. 
+     * and stuff into cipher.
      */
     if (n == 0) {
 	/* service unknown, log error, skip to next request */
diff --git a/eBones/usr.sbin/ksrvutil/ksrvutil.c b/eBones/usr.sbin/ksrvutil/ksrvutil.c
index 679d7e2..d1e9474 100644
--- a/eBones/usr.sbin/ksrvutil/ksrvutil.c
+++ b/eBones/usr.sbin/ksrvutil/ksrvutil.c
@@ -13,7 +13,7 @@ static char rcsid_ksrvutil_c[] =
 "BonesHeader: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/ksrvutil.c,v 4.1 89/09/26 09:33:49 jtkohl Exp ";
 #endif
 static const char rcsid[] =
-	"$Id: ksrvutil.c,v 1.1 1995/01/20 22:38:30 wollman Exp $";
+	"$Id: ksrvutil.c,v 1.2 1995/01/23 22:54:08 wollman Exp $";
 #endif	lint
 
 /*
@@ -72,9 +72,9 @@ copy_keyfile(progname, keyfile, backup_keyfile)
     char buf[BUFSIZ];		/* for copying keyfiles */
     int rcount;			/* for copying keyfiles */
     int try_again;
-    
+
     (void) bzero((char *)buf, sizeof(buf));
-    
+
     do {
 	try_again = FALSE;
 	if ((keyfile_fd = open(keyfile, O_RDONLY, 0)) < 0) {
@@ -83,8 +83,8 @@ copy_keyfile(progname, keyfile, backup_keyfile)
 	    }
 	    else {
 		try_again = TRUE;
-		if ((keyfile_fd = 
-		     open(keyfile, 
+		if ((keyfile_fd =
+		     open(keyfile,
 			  O_WRONLY | O_TRUNC | O_CREAT, SRVTAB_MODE)) < 0) {
 			err(1, "unable to create %s", keyfile);
 		}
@@ -98,8 +98,8 @@ copy_keyfile(progname, keyfile, backup_keyfile)
 
     keyfile_mode = get_mode(keyfile);
 
-    if ((backup_keyfile_fd = 
-	 open(backup_keyfile, O_WRONLY | O_TRUNC | O_CREAT, 
+    if ((backup_keyfile_fd =
+	 open(backup_keyfile, O_WRONLY | O_TRUNC | O_CREAT,
 	      keyfile_mode)) < 0) {
 	    err(1, "unable to write %s", backup_keyfile);
     }
@@ -134,8 +134,8 @@ safe_read_stdin(prompt, buf, size)
     }
     fflush(stdin);
     buf[strlen(buf)-1] = 0;
-}	
-  
+}
+
 
 void
 safe_write(progname, filename, fd, buf, len)
@@ -150,7 +150,7 @@ safe_write(progname, filename, fd, buf, len)
 	    close(fd);
 	    leave("In progress srvtab in this file.", 1);
     }
-}	
+}
 
 int
 yn(string)
@@ -161,7 +161,7 @@ yn(string)
     (void) printf("%s (y,n) [y] ", string);
     for (;;) {
 	safe_read_stdin("", ynbuf, sizeof(ynbuf));
-	
+
 	if ((ynbuf[0] == 'n') || (ynbuf[0] == 'N'))
 	    return(0);
 	else if ((ynbuf[0] == 'y') || (ynbuf[0] == 'Y') || (ynbuf[0] == 0))
@@ -174,7 +174,7 @@ yn(string)
 }
 
 void
-append_srvtab(progname, filename, fd, sname, sinst, 
+append_srvtab(progname, filename, fd, sname, sinst,
 		   srealm, key_vno, key)
   char *progname;
   char *filename;
@@ -192,7 +192,7 @@ append_srvtab(progname, filename, fd, sname, sinst,
     safe_write(progname, filename, fd, (char *)&key_vno, 1);
     safe_write(progname, filename, fd, (char *)key, sizeof(des_cblock));
     (void) fsync(fd);
-}    
+}
 
 unsigned short
 get_mode(filename)
@@ -202,8 +202,8 @@ get_mode(filename)
     unsigned short mode;
 
     (void) bzero((char *)&statbuf, sizeof(statbuf));
-    
-    if (stat(filename, &statbuf) < 0) 
+
+    if (stat(filename, &statbuf) < 0)
 	mode = SRVTAB_MODE;
     else
 	mode = statbuf.st_mode;
@@ -240,33 +240,33 @@ main(argc,argv)
     int change_this_key = FALSE;
     char databuf[BUFSIZ];
     int first_printed = FALSE;	/* have we printed the first item? */
-    
+
     int get_svc_new_key();
     void get_key_from_password();
     void print_key();
     void print_name();
-    
+
     (void) bzero((char *)sname, sizeof(sname));
     (void) bzero((char *)sinst, sizeof(sinst));
     (void) bzero((char *)srealm, sizeof(srealm));
-    
+
     (void) bzero((char *)change_tkt, sizeof(change_tkt));
     (void) bzero((char *)keyfile, sizeof(keyfile));
     (void) bzero((char *)work_keyfile, sizeof(work_keyfile));
     (void) bzero((char *)backup_keyfile, sizeof(backup_keyfile));
     (void) bzero((char *)local_realm, sizeof(local_realm));
-    
+
     (void) sprintf(change_tkt, "/tmp/tkt_ksrvutil.%d", getpid());
     krb_set_tkt_string(change_tkt);
 
     /* This is used only as a default for adding keys */
     if (krb_get_lrealm(local_realm, 1) != KSUCCESS)
 	(void) strcpy(local_realm, KRB_REALM);
-    
+
     for (i = 1; i < argc; i++) {
-	if (strcmp(argv[i], "-i") == 0) 
+	if (strcmp(argv[i], "-i") == 0)
 	    interactive++;
-	else if (strcmp(argv[i], "-k") == 0) 
+	else if (strcmp(argv[i], "-k") == 0)
 	    key++;
 	else if (strcmp(argv[i], "list") == 0) {
 	    if (arg_entered)
@@ -301,23 +301,23 @@ main(argc,argv)
 	else
 	    usage();
     }
-    
+
     if (!arg_entered)
 	usage();
 
     if (!keyfile[0])
 	(void) strcpy(keyfile, KEYFILE);
-    
+
     (void) strcpy(work_keyfile, keyfile);
     (void) strcpy(backup_keyfile, keyfile);
-    
+
     if (change || add) {
 	(void) strcat(work_keyfile, ".work");
 	(void) strcat(backup_keyfile, ".old");
-	
+
 	copy_keyfile(argv[0], keyfile, backup_keyfile);
     }
-    
+
     if (add)
 	copy_keyfile(argv[0], backup_keyfile, work_keyfile);
 
@@ -330,8 +330,8 @@ main(argc,argv)
     }
 
     if (change) {
-	if ((work_keyfile_fd = 
-	     open(work_keyfile, O_WRONLY | O_CREAT | O_TRUNC, 
+	if ((work_keyfile_fd =
+	     open(work_keyfile, O_WRONLY | O_CREAT | O_TRUNC,
 		  SRVTAB_MODE)) < 0) {
 		err(1, "unable to write %s", work_keyfile);
 	}
@@ -342,7 +342,7 @@ main(argc,argv)
 		err(1, "unable to append to %s", work_keyfile);
 	}
     }
-    
+
     if (change || list) {
 	while ((getst(backup_keyfile_fd, sname, SNAME_SZ) > 0) &&
 	       (getst(backup_keyfile_fd, sinst, INST_SZ) > 0) &&
@@ -379,19 +379,19 @@ main(argc,argv)
 		    change_this_key = 1;
 		else
 		    change_this_key = 0;
-		
+
 		if (change_this_key)
 		    (void) printf("Changing to version %d.\n", key_vno + 1);
 		else if (change)
 		    (void) printf("Not changing this key.\n");
-		
+
 		if (change_this_key) {
-		    /* 
+		    /*
 		     * Pick a new key and determine whether or not
 		     * it is safe to change
 		     */
-		    if ((status = 
-			 get_svc_new_key(new_key, sname, sinst, 
+		    if ((status =
+			 get_svc_new_key(new_key, sname, sinst,
 					 srealm, keyfile)) == KADM_SUCCESS)
 			key_vno++;
 		    else {
@@ -400,9 +400,9 @@ main(argc,argv)
 			change_this_key = FALSE;
 		    }
 		}
-		else 
+		else
 		    (void) bcopy(old_key, new_key, sizeof(new_key));
-		append_srvtab(argv[0], work_keyfile, work_keyfile_fd, 
+		append_srvtab(argv[0], work_keyfile, work_keyfile_fd,
 			      sname, sinst, srealm, key_vno, new_key);
 		if (key && change_this_key) {
 		    (void) printf("Old key: ");
@@ -417,7 +417,7 @@ main(argc,argv)
 			(void) dest_tkt();
 		    }
 		    else {
-			com_err(argv[0], status, 
+			com_err(argv[0], status,
 				" attempting to change password.");
 			(void) dest_tkt();
 			/* XXX This knows the format of a keyfile */
@@ -464,17 +464,17 @@ main(argc,argv)
 		print_key(new_key);
 		(void) printf("\n");
 	    }
-	    append_srvtab(argv[0], work_keyfile, work_keyfile_fd, 
+	    append_srvtab(argv[0], work_keyfile, work_keyfile_fd,
 			  sname, sinst, srealm, key_vno, new_key);
 	    (void) printf("Key successfully added.\n");
 	} while (yn("Would you like to add another key?"));
     }
 
-    if (change || list) 
+    if (change || list)
 	if (close(backup_keyfile_fd) < 0) {
 		warn("failure closing %s, continuing", backup_keyfile);
 	}
-    
+
     if (change || add) {
 	if (close(work_keyfile_fd) < 0) {
 		err(1, "failure closing %s", work_keyfile);
@@ -525,7 +525,7 @@ get_svc_new_key(new_key, sname, sinst, srealm, keyfile)
 
     if (((status = krb_get_svc_in_tkt(sname, sinst, srealm, PWSERV_NAME,
 				      KADM_SINST, 1, keyfile)) == KSUCCESS) &&
-	((status = kadm_init_link("changepw", KRB_MASTER, srealm)) == 
+	((status = kadm_init_link("changepw", KRB_MASTER, srealm)) ==
 	 KADM_SUCCESS)) {
 #ifdef NOENCRYPTION
 	(void) bzero((char *) new_key, sizeof(des_cblock));
@@ -535,7 +535,7 @@ get_svc_new_key(new_key, sname, sinst, srealm, keyfile)
 #endif /* NOENCRYPTION */
 	return(KADM_SUCCESS);
     }
-    
+
     return(status);
 }
 
@@ -555,7 +555,7 @@ get_key_from_password(key)
     (void) des_string_to_key(password, key);
 #endif /* NOENCRYPTION */
     (void) bzero((char *)password, sizeof(password));
-}    
+}
 
 usage()
 {
diff --git a/eBones/usr.sbin/kstash/Makefile b/eBones/usr.sbin/kstash/Makefile
index 8331c97a..d096b9c 100644
--- a/eBones/usr.sbin/kstash/Makefile
+++ b/eBones/usr.sbin/kstash/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 3/5/91
-#	$Id: Makefile,v 1.2 1994/07/19 19:27:04 g89r4222 Exp $
+#	$Id: Makefile,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $
 
 PROG=	kstash
 CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes 
+LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 NOMAN=	noman
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kstash/kstash.c b/eBones/usr.sbin/kstash/kstash.c
index 696e4e1..d8afe20 100644
--- a/eBones/usr.sbin/kstash/kstash.c
+++ b/eBones/usr.sbin/kstash/kstash.c
@@ -1,16 +1,16 @@
 /*
  * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
- * of Technology 
+ * of Technology
  * For copying and distribution information, please see the file
  * <Copyright.MIT>.
  *
  *	from: kstash.c,v 4.0 89/01/23 09:45:43 jtkohl Exp $
- *	$Id: kstash.c,v 1.2 1994/07/19 19:27:05 g89r4222 Exp $
+ *	$Id: kstash.c,v 1.1.1.1 1994/09/30 14:50:05 csgr Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kstash.c,v 1.2 1994/07/19 19:27:05 g89r4222 Exp $";
+"$Id: kstash.c,v 1.1.1.1 1994/09/30 14:50:05 csgr Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -84,7 +84,7 @@ main(argc, argv)
     clear_secrets();
 }
 
-static void 
+static void
 clear_secrets()
 {
     bzero(master_key_schedule, sizeof(master_key_schedule));
-- 
cgit v1.1