Start the eBones cleanup ball rolling.

These are the start of a lot of work to clean up the FreeBSD eBones code.
these changes include, but are not limited to:
- Create prototypes for all the library routines
- Make all the libraries compile clean with -Wall set
- Fix numerous small bugs shown up in the above process
- Prepare the code for libdes's removal to secure/
- add register, registerd and make_keypair to the make
Lots more will follow in days to come.

OK'ed by: rgrimes

29 files changed, 96 insertions, 55 deletions

diff --git a/eBones/usr.sbin/ext_srvtab/Makefile b/eBones/usr.sbin/ext_srvtab/Makefile
index f30bbbb..b0a2a01 100644
--- a/eBones/usr.sbin/ext_srvtab/Makefile
+++ b/eBones/usr.sbin/ext_srvtab/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.2 1994/07/19 19:22:34 g89r4222 Exp $
+#	$Id: Makefile,v 1.3 1995/07/18 16:35:54 mark Exp $
 
 PROG=	ext_srvtab
 CFLAGS+=-DKERBEROS -I${.CURDIR}/../include
diff --git a/eBones/usr.sbin/ext_srvtab/ext_srvtab.c b/eBones/usr.sbin/ext_srvtab/ext_srvtab.c
index 093dfe2..6b655c7 100644
--- a/eBones/usr.sbin/ext_srvtab/ext_srvtab.c
+++ b/eBones/usr.sbin/ext_srvtab/ext_srvtab.c
@@ -2,12 +2,12 @@
  * 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.1.1.1 1994/09/30 14:49:53 csgr Exp $
+ *	$Id: ext_srvtab.c,v 1.3 1995/07/18 16:35:55 mark Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: ext_srvtab.c,v 1.1.1.1 1994/09/30 14:49:53 csgr Exp $";
+"$Id: ext_srvtab.c,v 1.3 1995/07/18 16:35:55 mark Exp $";
 #endif	lint
 
 #include <stdio.h>
diff --git a/eBones/usr.sbin/kadmin/Makefile b/eBones/usr.sbin/kadmin/Makefile
index 77069be..620ab81 100644
--- a/eBones/usr.sbin/kadmin/Makefile
+++ b/eBones/usr.sbin/kadmin/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.1 1995/07/18 16:36:59 mark Exp $
 
 PROG=	kadmind
 SRCS=	admin_server.c kadm_funcs.c kadm_ser_wrap.c kadm_server.c
diff --git a/eBones/usr.sbin/kadmin/kadm_funcs.c b/eBones/usr.sbin/kadmin/kadm_funcs.c
index 9f06e30..4ed2365 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: kadm_funcs.c,v 1.1 1995/01/20 03:12:55 wollman Exp $";
+	"$Id: kadm_funcs.c,v 1.1 1995/07/18 16:37:02 mark Exp $";
 #endif	lint
 
 /*
diff --git a/eBones/usr.sbin/kadmin/kadm_server.h b/eBones/usr.sbin/kadmin/kadm_server.h
index 33b1904..2d6f8bf 100644
--- a/eBones/usr.sbin/kadmin/kadm_server.h
+++ b/eBones/usr.sbin/kadmin/kadm_server.h
@@ -1,6 +1,6 @@
 /*
- * $Source: /home/ncvs/src/eBones/kadmind/kadm_server.h,v $
- * $Author: wollman $
+ * $Source: /usr/cvs/src/eBones/kadmind/kadm_server.h,v $
+ * $Author: mark $
  * 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.
@@ -24,7 +24,7 @@
 
 #include <sys/types.h>
 #include <kerberosIV/krb.h>
-#include <kerberosIV/des.h>
+#include <des.h>
 
 typedef struct {
   struct sockaddr_in admin_addr;
diff --git a/eBones/usr.sbin/kadmind/Makefile b/eBones/usr.sbin/kadmind/Makefile
index 77069be..620ab81 100644
--- a/eBones/usr.sbin/kadmind/Makefile
+++ b/eBones/usr.sbin/kadmind/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.1 1995/07/18 16:36:59 mark Exp $
 
 PROG=	kadmind
 SRCS=	admin_server.c kadm_funcs.c kadm_ser_wrap.c kadm_server.c
diff --git a/eBones/usr.sbin/kadmind/kadm_funcs.c b/eBones/usr.sbin/kadmind/kadm_funcs.c
index 9f06e30..4ed2365 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: kadm_funcs.c,v 1.1 1995/01/20 03:12:55 wollman Exp $";
+	"$Id: kadm_funcs.c,v 1.1 1995/07/18 16:37:02 mark Exp $";
 #endif	lint
 
 /*
diff --git a/eBones/usr.sbin/kadmind/kadm_server.h b/eBones/usr.sbin/kadmind/kadm_server.h
index 33b1904..2d6f8bf 100644
--- a/eBones/usr.sbin/kadmind/kadm_server.h
+++ b/eBones/usr.sbin/kadmind/kadm_server.h
@@ -1,6 +1,6 @@
 /*
- * $Source: /home/ncvs/src/eBones/kadmind/kadm_server.h,v $
- * $Author: wollman $
+ * $Source: /usr/cvs/src/eBones/kadmind/kadm_server.h,v $
+ * $Author: mark $
  * 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.
@@ -24,7 +24,7 @@
 
 #include <sys/types.h>
 #include <kerberosIV/krb.h>
-#include <kerberosIV/des.h>
+#include <des.h>
 
 typedef struct {
   struct sockaddr_in admin_addr;
diff --git a/eBones/usr.sbin/kdb_destroy/Makefile b/eBones/usr.sbin/kdb_destroy/Makefile
index a48805b..2e8fcb9 100644
--- a/eBones/usr.sbin/kdb_destroy/Makefile
+++ b/eBones/usr.sbin/kdb_destroy/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.2 1994/07/19 19:23:46 g89r4222 Exp $
+#	$Id: Makefile,v 1.3 1995/07/18 16:37:22 mark Exp $
 
 PROG=	kdb_destroy
 CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include
diff --git a/eBones/usr.sbin/kdb_destroy/kdb_destroy.c b/eBones/usr.sbin/kdb_destroy/kdb_destroy.c
index ce59cc9..b669de2 100644
--- a/eBones/usr.sbin/kdb_destroy/kdb_destroy.c
+++ b/eBones/usr.sbin/kdb_destroy/kdb_destroy.c
@@ -4,12 +4,12 @@
  * <Copyright.MIT>.
  *
  *	from: kdb_destroy.c,v 4.0 89/01/24 21:49:02 jtkohl Exp $
- *	$Id: kdb_destroy.c,v 1.3 1995/08/02 23:08:14 pst Exp $
+ *	$Id: kdb_destroy.c,v 1.5 1995/08/04 06:35:45 mark Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kdb_destroy.c,v 1.3 1995/08/02 23:08:14 pst Exp $";
+"$Id: kdb_destroy.c,v 1.5 1995/08/04 06:35:45 mark Exp $";
 #endif	lint
 
 #include <strings.h>
@@ -17,10 +17,11 @@ static char rcsid[] =
 #include "krb.h"
 #include "krb_db.h"
 
-#ifdef dbm_pagfno
+#if defined(__FreeBSD__) || defined(__NetBSD__)
 #define	DB
 #endif
 
+
 main()
 {
     char    answer[10];		/* user input */
diff --git a/eBones/usr.sbin/kdb_edit/Makefile b/eBones/usr.sbin/kdb_edit/Makefile
index 65a5e5a..792e7c5 100644
--- a/eBones/usr.sbin/kdb_edit/Makefile
+++ b/eBones/usr.sbin/kdb_edit/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 2/14/91
-#	$Id: Makefile,v 1.2 1994/07/19 19:23:53 g89r4222 Exp $
+#	$Id: Makefile,v 1.3 1995/07/18 16:37:25 mark Exp $
 
 PROG=	kdb_edit
 CFLAGS+=-DKERBEROS -DDEBUG -I. -I${.CURDIR}/../include
diff --git a/eBones/usr.sbin/kdb_edit/kdb_edit.c b/eBones/usr.sbin/kdb_edit/kdb_edit.c
index 00c2308..61cf71a 100644
--- a/eBones/usr.sbin/kdb_edit/kdb_edit.c
+++ b/eBones/usr.sbin/kdb_edit/kdb_edit.c
@@ -8,7 +8,7 @@
  * 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.2 1995/05/30 06:40:41 rgrimes Exp $
+ *	$Id: kdb_edit.c,v 1.5 1995/08/03 17:15:54 mark Exp $
  */
 
 /*
@@ -17,7 +17,7 @@
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kdb_edit.c,v 1.2 1995/05/30 06:40:41 rgrimes Exp $";
+"$Id: kdb_edit.c,v 1.5 1995/08/03 17:15:54 mark Exp $";
 #endif	lint
 
 #include <stdio.h>
diff --git a/eBones/usr.sbin/kdb_edit/maketime.c b/eBones/usr.sbin/kdb_edit/maketime.c
index 057ecc3..ed485af 100644
--- a/eBones/usr.sbin/kdb_edit/maketime.c
+++ b/eBones/usr.sbin/kdb_edit/maketime.c
@@ -6,7 +6,7 @@
  * Convert a struct tm * to a UNIX time.
  *
  *	from: maketime.c,v 4.2 90/01/09 15:54:51 raeburn Exp $
- *	$Id: maketime.c,v 1.2 1994/07/19 19:23:56 g89r4222 Exp $
+ *	$Id: maketime.c,v 1.3 1995/07/18 16:37:29 mark Exp $
  */
 
 #ifndef	lint
diff --git a/eBones/usr.sbin/kdb_edit/time.h b/eBones/usr.sbin/kdb_edit/time.h
index ed128d8..ae84e2e 100644
--- a/eBones/usr.sbin/kdb_edit/time.h
+++ b/eBones/usr.sbin/kdb_edit/time.h
@@ -6,7 +6,7 @@
 
 /*
  *	from: time.h,v 1.1 82/05/06 11:34:29 wft Exp $
- *	$Id: time.h,v 1.2 1994/07/19 19:23:58 g89r4222 Exp $
+ *	$Id: time.h,v 1.3 1995/07/18 16:37:31 mark Exp $
  */
 
 struct tm {     /* See defines below for allowable ranges */
diff --git a/eBones/usr.sbin/kdb_init/Makefile b/eBones/usr.sbin/kdb_init/Makefile
index ce51a9f..7738312 100644
--- a/eBones/usr.sbin/kdb_init/Makefile
+++ b/eBones/usr.sbin/kdb_init/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.2 1994/07/19 19:24:03 g89r4222 Exp $
+#	$Id: Makefile,v 1.3 1995/07/18 16:37:34 mark Exp $
 
 PROG=	kdb_init
 CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include
diff --git a/eBones/usr.sbin/kdb_init/kdb_init.c b/eBones/usr.sbin/kdb_init/kdb_init.c
index 7a8e32f..d48ee096 100644
--- a/eBones/usr.sbin/kdb_init/kdb_init.c
+++ b/eBones/usr.sbin/kdb_init/kdb_init.c
@@ -7,12 +7,12 @@
  * already exists.
  *
  *	from: kdb_init.c,v 4.0 89/01/24 21:50:45 jtkohl Exp $
- *	$Id: kdb_init.c,v 1.1.1.1 1994/09/30 14:49:56 csgr Exp $
+ *	$Id: kdb_init.c,v 1.4 1995/07/18 16:37:35 mark Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kdb_init.c,v 1.1.1.1 1994/09/30 14:49:56 csgr Exp $";
+"$Id: kdb_init.c,v 1.4 1995/07/18 16:37:35 mark Exp $";
 #endif	lint
 
 #include <stdio.h>
@@ -119,9 +119,6 @@ add_principal(name, instance, aap_op)
     Principal principal;
     char    datestring[50];
     char    pw_str[255];
-    void    read_pw_string();
-    void    string_to_key();
-    void    random_key();
     struct tm *tm, *localtime();
     C_Block new_key;
 
diff --git a/eBones/usr.sbin/kdb_util/Makefile b/eBones/usr.sbin/kdb_util/Makefile
index b3513d6..bffeb51 100644
--- a/eBones/usr.sbin/kdb_util/Makefile
+++ b/eBones/usr.sbin/kdb_util/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 2/14/91
-#	$Id: Makefile,v 1.2 1994/07/19 19:24:09 g89r4222 Exp $
+#	$Id: Makefile,v 1.3 1995/07/18 16:37:38 mark Exp $
 
 PROG=	kdb_util
 CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../kdb_edit \
diff --git a/eBones/usr.sbin/kdb_util/kdb_util.c b/eBones/usr.sbin/kdb_util/kdb_util.c
index 97f7a65e..140e211 100644
--- a/eBones/usr.sbin/kdb_util/kdb_util.c
+++ b/eBones/usr.sbin/kdb_util/kdb_util.c
@@ -12,12 +12,12 @@
  * 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.2 1995/05/30 06:40:44 rgrimes Exp $
+ *	$Id: kdb_util.c,v 1.5 1995/08/03 17:15:57 mark Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kdb_util.c,v 1.2 1995/05/30 06:40:44 rgrimes Exp $";
+"$Id: kdb_util.c,v 1.5 1995/08/03 17:15:57 mark Exp $";
 #endif	lint
 
 #include <stdio.h>
diff --git a/eBones/usr.sbin/kerberos/Makefile b/eBones/usr.sbin/kerberos/Makefile
index 44853ef..bd3d89f 100644
--- a/eBones/usr.sbin/kerberos/Makefile
+++ b/eBones/usr.sbin/kerberos/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $
+#	$Id: Makefile,v 1.3 1995/07/18 16:37:47 mark Exp $
 
 PROG=	kerberos
 SRCS=	kerberos.c cr_err_reply.c
diff --git a/eBones/usr.sbin/kerberos/cr_err_reply.c b/eBones/usr.sbin/kerberos/cr_err_reply.c
index c5178fe..924a98f 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.1.1 1994/09/30 14:49:57 csgr Exp $
+ *	$Id: cr_err_reply.c,v 1.2 1995/07/18 16:37:49 mark Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: cr_err_reply.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $";
+"$Id: cr_err_reply.c,v 1.2 1995/07/18 16:37:49 mark Exp $";
 #endif /* lint */
 
 #include <sys/types.h>
diff --git a/eBones/usr.sbin/kerberos/kerberos.c b/eBones/usr.sbin/kerberos/kerberos.c
index a7f391c..d0ce795 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.1.1.1 1994/09/30 14:49:57 csgr Exp $
+ *	$Id: kerberos.c,v 1.4 1995/07/18 16:37:51 mark Exp $
  */
 
 #ifndef lint
 static char rcsid[] =
-"$Id: kerberos.c,v 1.1.1.1 1994/09/30 14:49:57 csgr Exp $";
+"$Id: kerberos.c,v 1.4 1995/07/18 16:37:51 mark Exp $";
 #endif  lint
 
 #include <stdio.h>
diff --git a/eBones/usr.sbin/kprop/Makefile b/eBones/usr.sbin/kprop/Makefile
index 962813e..fa70067 100644
--- a/eBones/usr.sbin/kprop/Makefile
+++ b/eBones/usr.sbin/kprop/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id$
+#	$Id: Makefile,v 1.1.1.1 1995/08/03 07:36:18 mark Exp $
 
 PROG=	kprop
 CFLAGS+=-I${.CURDIR}/../include
diff --git a/eBones/usr.sbin/kprop/kprop.c b/eBones/usr.sbin/kprop/kprop.c
index 91fb08f..cde1cce 100644
--- a/eBones/usr.sbin/kprop/kprop.c
+++ b/eBones/usr.sbin/kprop/kprop.c
@@ -5,14 +5,36 @@
  * For copying and distribution information,
  * please see the file <mit-copyright.h>.
  *
- * $Revision: 4.7 $
- * $Date: 92/11/10 23:01:06 $
+ * $Revision: 1.1.1.1 $
+ * $Date: 1995/08/03 07:36:18 $
  * $State: Exp $
- * $Source: /afs/net.mit.edu/project/krb4/src/slave/RCS/kprop.c,v $
- * $Author: tytso $
+ * $Source: /usr/cvs/src/eBones/kprop/kprop.c,v $
+ * $Author: mark $
  * $Locker:  $
  *
- * $Log:	kprop.c,v $
+ * $Log: kprop.c,v $
+ * Revision 1.1.1.1  1995/08/03  07:36:18  mark
+ * Import an updated revision of the MIT kprop program for distributing
+ * kerberos databases to slave servers.
+ *
+ * NOTE: This method was abandoned by MIT long ago, this code is close to
+ *       garbage,  but it is slightly more secure than using rdist.
+ *       There is no documentation available on how to use it, and
+ *       it should -not- be built by default.
+ *
+ * Obtained from:	MIT Project Athena
+ *
+ * Revision 1.1.1.1  1995/08/02  22:11:44  pst
+ * Import an updated revision of the MIT kprop program for distributing
+ * kerberos databases to slave servers.
+ *
+ * NOTE: This method was abandoned by MIT long ago, this code is close to
+ *       garbage,  but it is slightly more secure than using rdist.
+ *       There is no documentation available on how to use it, and
+ *       it should -not- be built by default.
+ *
+ * Obtained from:	MIT Project Athena
+ *
  * Revision 4.7  92/11/10  23:01:06  tytso
  * Removed incompatible #include
  * 
@@ -50,7 +72,7 @@
 
 #ifndef	lint
 static char rcsid_kprop_c[] =
-"$Id: kprop.c,v 4.7 92/11/10 23:01:06 tytso Exp $";
+"$Id: kprop.c,v 1.1.1.1 1995/08/03 07:36:18 mark Exp $";
 #endif	lint
 
 #include <stdio.h>
diff --git a/eBones/usr.sbin/kprop/kprop.h b/eBones/usr.sbin/kprop/kprop.h
index 2f34e36..5197276 100644
--- a/eBones/usr.sbin/kprop/kprop.h
+++ b/eBones/usr.sbin/kprop/kprop.h
@@ -4,14 +4,36 @@
  * For copying and distribution information,
  * please see the file <mit-copyright.h>.
  *
- * $Revision: 4.1 $
- * $Date: 92/10/23 15:45:13 $
+ * $Revision: 1.1.1.1 $
+ * $Date: 1995/08/03 07:36:18 $
  * $State: Exp $
- * $Source: /afs/net.mit.edu/project/krb4/src/slave/RCS/kprop.h,v $
- * $Author: tytso $
+ * $Source: /usr/cvs/src/eBones/kprop/kprop.h,v $
+ * $Author: mark $
  * $Locker:  $
  *
- * $Log:	kprop.h,v $
+ * $Log: kprop.h,v $
+ * Revision 1.1.1.1  1995/08/03  07:36:18  mark
+ * Import an updated revision of the MIT kprop program for distributing
+ * kerberos databases to slave servers.
+ *
+ * NOTE: This method was abandoned by MIT long ago, this code is close to
+ *       garbage,  but it is slightly more secure than using rdist.
+ *       There is no documentation available on how to use it, and
+ *       it should -not- be built by default.
+ *
+ * Obtained from:	MIT Project Athena
+ *
+ * Revision 1.1.1.1  1995/08/02  22:11:44  pst
+ * Import an updated revision of the MIT kprop program for distributing
+ * kerberos databases to slave servers.
+ *
+ * NOTE: This method was abandoned by MIT long ago, this code is close to
+ *       garbage,  but it is slightly more secure than using rdist.
+ *       There is no documentation available on how to use it, and
+ *       it should -not- be built by default.
+ *
+ * Obtained from:	MIT Project Athena
+ *
  * Revision 4.1  92/10/23  15:45:13  tytso
  * Change the location of KPROP_KDBUTIL to be /kerberos/bin/kdb_util.
  * 
diff --git a/eBones/usr.sbin/ksrvutil/Makefile b/eBones/usr.sbin/ksrvutil/Makefile
index bdff452..1fcaf0c 100644
--- a/eBones/usr.sbin/ksrvutil/Makefile
+++ b/eBones/usr.sbin/ksrvutil/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.1 1995/07/18 16:40:09 mark Exp $
 
 PROG=	ksrvutil
 SRCS=	ksrvutil.c
diff --git a/eBones/usr.sbin/ksrvutil/ksrvutil.c b/eBones/usr.sbin/ksrvutil/ksrvutil.c
index d1e9474..6d81e72 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.2 1995/01/23 22:54:08 wollman Exp $";
+	"$Id: ksrvutil.c,v 1.1 1995/07/18 16:40:11 mark Exp $";
 #endif	lint
 
 /*
diff --git a/eBones/usr.sbin/kstash/Makefile b/eBones/usr.sbin/kstash/Makefile
index d096b9c..b194a2c 100644
--- a/eBones/usr.sbin/kstash/Makefile
+++ b/eBones/usr.sbin/kstash/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 3/5/91
-#	$Id: Makefile,v 1.1.1.1 1994/09/30 14:50:04 csgr Exp $
+#	$Id: Makefile,v 1.3 1995/07/18 16:40:14 mark Exp $
 
 PROG=	kstash
 CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include
diff --git a/eBones/usr.sbin/kstash/kstash.c b/eBones/usr.sbin/kstash/kstash.c
index d8afe20..d5a59bf 100644
--- a/eBones/usr.sbin/kstash/kstash.c
+++ b/eBones/usr.sbin/kstash/kstash.c
@@ -5,12 +5,12 @@
  * <Copyright.MIT>.
  *
  *	from: kstash.c,v 4.0 89/01/23 09:45:43 jtkohl Exp $
- *	$Id: kstash.c,v 1.1.1.1 1994/09/30 14:50:05 csgr Exp $
+ *	$Id: kstash.c,v 1.3 1995/07/18 16:40:16 mark Exp $
  */
 
 #ifndef	lint
 static char rcsid[] =
-"$Id: kstash.c,v 1.1.1.1 1994/09/30 14:50:05 csgr Exp $";
+"$Id: kstash.c,v 1.3 1995/07/18 16:40:16 mark Exp $";
 #endif	lint
 
 #include <stdio.h>
diff --git a/eBones/usr.sbin/make_keypair/make_keypair.c b/eBones/usr.sbin/make_keypair/make_keypair.c
index c9883ed..5cc1777 100644
--- a/eBones/usr.sbin/make_keypair/make_keypair.c
+++ b/eBones/usr.sbin/make_keypair/make_keypair.c
@@ -46,12 +46,11 @@ static char sccsid[] = "@(#)make_keypair.c	8.1 (Berkeley) 6/1/93";
 #include <netinet/in.h>
 #include <stdio.h>
 #include <netdb.h>
-#include <kerberosIV/des.h>
+#include <des.h>
 #include <kerberosIV/krb.h>
 #include "pathnames.h"
 #include "register_proto.h"
 
-extern void random_key(), herror();
 void make_key(), usage();
 
 char * progname;