include file fix-ups

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

31 files changed, 60 insertions, 117 deletions

diff --git a/src/lib/crypto/des/cbc_cksum.c b/src/lib/crypto/des/cbc_cksum.c
index 6bb8ef9eb8..fada850993 100644
--- a/src/lib/crypto/des/cbc_cksum.c
+++ b/src/lib/crypto/des/cbc_cksum.c
@@ -24,11 +24,8 @@ static char des_cbc_checksum_c[] =
 
 #include <krb5/copyright.h>
 
-#include <sys/errno.h>
-
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
-#include <krb5/krb5_err.h>
 
 #include "des_int.h"
 
diff --git a/src/lib/crypto/des/cksum.c b/src/lib/crypto/des/cksum.c
index 15952cdc09..1bcbab0975 100644
--- a/src/lib/crypto/des/cksum.c
+++ b/src/lib/crypto/des/cksum.c
@@ -25,11 +25,10 @@ static char rcsid_cksum_c[] =
 "$Id$";
 #endif	/* !lint & !SABER */
 
-#include <mit-copyright.h>
-#include <stdio.h>
-#include <strings.h>
-
+#include <krb5/copyright.h>
 #include <krb5/krb5.h>
+#include <krb5/ext-proto.h>
+
 #include "des_int.h"
 
 extern int mit_des_debug;
diff --git a/src/lib/crypto/des/enc_dec.c b/src/lib/crypto/des/enc_dec.c
index 0036546e4f..72f19e1398 100644
--- a/src/lib/crypto/des/enc_dec.c
+++ b/src/lib/crypto/des/enc_dec.c
@@ -30,9 +30,6 @@ static char rcsid_enc_dec_c[] =
 
 #include <krb5/copyright.h>
 
-#include <sys/errno.h>
-#include <krb5/krb5_err.h>
-
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 #include <krb5/crc-32.h>
diff --git a/src/lib/crypto/des/fin_rndkey.c b/src/lib/crypto/des/fin_rndkey.c
index b707923142..02f588c096 100644
--- a/src/lib/crypto/des/fin_rndkey.c
+++ b/src/lib/crypto/des/fin_rndkey.c
@@ -15,9 +15,6 @@ static char des_fnr_key_c[] =
 #endif	/* !lint & !SABER */
 
 #include <krb5/copyright.h>
-
-#include <sys/errno.h>
-
 #include <krb5/krb5.h>
 #include <krb5/mit-des.h>
 #include <krb5/ext-proto.h>
diff --git a/src/lib/crypto/des/finish_key.c b/src/lib/crypto/des/finish_key.c
index 338688e9f4..39f7db22fa 100644
--- a/src/lib/crypto/des/finish_key.c
+++ b/src/lib/crypto/des/finish_key.c
@@ -15,9 +15,6 @@ static char des_fin_key_c[] =
 #endif	/* !lint & !SABER */
 
 #include <krb5/copyright.h>
-
-#include <sys/errno.h>
-
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/crypto/des/init_rkey.c b/src/lib/crypto/des/init_rkey.c
index 8094222b6d..02be2234c4 100644
--- a/src/lib/crypto/des/init_rkey.c
+++ b/src/lib/crypto/des/init_rkey.c
@@ -15,12 +15,8 @@ static char des_inr_key_c[] =
 #endif	/* !lint & !SABER */
 
 #include <krb5/copyright.h>
-
-#include <sys/errno.h>
-
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
-#include <krb5/krb5_err.h>
 
 #include "des_int.h"
 
diff --git a/src/lib/crypto/des/key_parity.c b/src/lib/crypto/des/key_parity.c
index 62d2f49719..ca7c62aea9 100644
--- a/src/lib/crypto/des/key_parity.c
+++ b/src/lib/crypto/des/key_parity.c
@@ -19,10 +19,10 @@
 
 #if !defined(lint) && !defined(SABER)
 static char key_parity_c[] =
-"$Header$";
+"$Id$";
 #endif	/* !lint & !SABER */
 
-#include <mit-copyright.h>
+#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include "des_int.h"
 
diff --git a/src/lib/crypto/des/key_sched.c b/src/lib/crypto/des/key_sched.c
index 3c55181330..b396e018f0 100644
--- a/src/lib/crypto/des/key_sched.c
+++ b/src/lib/crypto/des/key_sched.c
@@ -32,10 +32,10 @@
 
 #if !defined(lint) && !defined(SABER)
 static char key_sched_c[] =
-"$Header$";
+"$Id$";
 #endif	/* !lint & !SABER */
 
-#include <mit-copyright.h>
+#include <krb5/copyright.h>
 #include <stdio.h>
 
 #include <krb5/krb5.h>
diff --git a/src/lib/crypto/des/make_e.c b/src/lib/crypto/des/make_e.c
index 032eff2910..6842f55ff9 100644
--- a/src/lib/crypto/des/make_e.c
+++ b/src/lib/crypto/des/make_e.c
@@ -2,17 +2,18 @@
  * $Source$
  * $Author$
  *
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1987, 1988,1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information,
- * please see the file <mit-copyright.h>.
+ * please see the file <krb5/copyright.h>.
  *
  * This routine generates source code that implements the "E"
  * operations of the DES.
  */
 
-#include <stdio.h>
+#include <krb5/mit-copyright.h>
 #include <krb5/krb5.h>
+#include <stdio.h>
 #include "des_int.h"
 #include "tables.h"
 
diff --git a/src/lib/crypto/des/make_fp.c b/src/lib/crypto/des/make_fp.c
index 0bfb8a56d5..22bc330915 100644
--- a/src/lib/crypto/des/make_fp.c
+++ b/src/lib/crypto/des/make_fp.c
@@ -2,18 +2,18 @@
  * $Source$
  * $Author$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1988,1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information,
- * please see the file <mit-copyright.h>.
+ * please see the file <krb5/copyright.h>.
  *
  * This file contains a generation routine for source code
  * implementing the final permutation of the DES.
  */
 
 #include <krb5/copyright.h>
-#include <stdio.h>
 #include <krb5/krb5.h>
+#include <stdio.h>
 #include <krb5/ext-proto.h>
 #include "des_int.h"
 #include "tables.h"
diff --git a/src/lib/crypto/des/make_ip.c b/src/lib/crypto/des/make_ip.c
index 40cb7e77db..feb02f71fc 100644
--- a/src/lib/crypto/des/make_ip.c
+++ b/src/lib/crypto/des/make_ip.c
@@ -2,18 +2,18 @@
  * $Source$
  * $Author$
  *
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1987, 1988,1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * <krb5/copyright.h>.
  *
  * This routine generates source code implementing the initial
  * permutation of the DES.
  */
 
-#include <mit-copyright.h>
-#include <stdio.h>
+#include <krb5/copyright.h>
 #include <krb5/krb5.h>
+#include <stdio.h>
 #include "des_int.h"
 #include "tables.h"
 
diff --git a/src/lib/crypto/des/make_kp.c b/src/lib/crypto/des/make_kp.c
index dc337fa246..8863e370b2 100644
--- a/src/lib/crypto/des/make_kp.c
+++ b/src/lib/crypto/des/make_kp.c
@@ -3,10 +3,10 @@
  * $Author$
  * $Locker$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1988,1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * <krb5/copyright.h>.
  *
  * This routine calculates an effective Key schedule set of
  * permutations for des.  Beginning with the pre-defined key schedule
@@ -16,15 +16,14 @@
  * subscripts starting at 0.
  */
 
-#include <mit-copyright.h>
-#include <stdio.h>
-#include <errno.h>
+#include <krb5/copyright.h>
 #include <krb5/krb5.h>
+#include <stdio.h>
 #include "des_int.h"
 
 #ifndef lint
 static char rcsid[]=
-    "$Header$";
+    "$Id$";
 #endif /* lint */
 
 char *progname;
diff --git a/src/lib/crypto/des/make_odd.c b/src/lib/crypto/des/make_odd.c
index d44159523b..84653ea50c 100644
--- a/src/lib/crypto/des/make_odd.c
+++ b/src/lib/crypto/des/make_odd.c
@@ -2,10 +2,10 @@
  * $Source$
  * $Author$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1988,1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see
- * the file <mit-copyright.h>.
+ * the file <krb5/copyright.h>.
  *
  * This routine generates an odd-parity table for use in key generation.
  */
diff --git a/src/lib/crypto/des/make_p.c b/src/lib/crypto/des/make_p.c
index 65b8090000..4f2cc9bf88 100644
--- a/src/lib/crypto/des/make_p.c
+++ b/src/lib/crypto/des/make_p.c
@@ -2,17 +2,17 @@
  * $Source$
  * $Author$
  *
- * Copyright 1985, 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1985, 1988,1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please
- * see the file <mit-copyright.h>.
+ * see the file <krb5/copyright.h>.
  *
  * This routine generates the P permutation code for the DES.
  */
 
 #include <krb5/copyright.h>
-#include <stdio.h>
 #include <krb5/krb5.h>
+#include <stdio.h>
 #include "des_int.h"
 #include "tables.h"
 
diff --git a/src/lib/crypto/des/make_pt.c b/src/lib/crypto/des/make_pt.c
index f0c2a10c3a..ffe9cb5987 100644
--- a/src/lib/crypto/des/make_pt.c
+++ b/src/lib/crypto/des/make_pt.c
@@ -2,16 +2,16 @@
  * $Source$
  * $Author$
  *
- * Copyright 1985, 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1985, 1988,1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please
- * see the file <mit-copyright.h>.
+ * see the file <krb5/copyright.h>.
  *
  */
 
-#include <mit-copyright.h>
-#include <stdio.h>
+#include <krb5/copyright.h>
 #include <krb5/krb5.h>
+#include <stdio.h>
 #include "des_int.h"
 #include "tables.h"
 
diff --git a/src/lib/crypto/des/make_s.c b/src/lib/crypto/des/make_s.c
index e4c42cacab..342b4c873d 100644
--- a/src/lib/crypto/des/make_s.c
+++ b/src/lib/crypto/des/make_s.c
@@ -2,15 +2,15 @@
  * $Source$
  * $Author$
  *
- * Copyright 1985, 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1985, 1988, 1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please
- * see the file <mit-copyright.h>.
+ * see the file <krb5/copyright.h>.
  */
 
-#include <mit-copyright.h>
-#include <stdio.h>
+#include <krb5/copyright.h>
 #include <krb5/krb5.h>
+#include <stdio.h>
 #include "des_int.h"
 #include "s_table.h"
 
diff --git a/src/lib/crypto/des/make_st.c b/src/lib/crypto/des/make_st.c
index f267e0607f..144f20f0de 100644
--- a/src/lib/crypto/des/make_st.c
+++ b/src/lib/crypto/des/make_st.c
@@ -2,15 +2,15 @@
  * $Source$
  * $Author$
  *
- * Copyright 1985, 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1985, 1988, 1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please
- * see the file <mit-copyright.h>.
+ * see the file <krb5/copyright.h>.
  */
 
-#include <mit-copyright.h>
-#include <stdio.h>
+#include <krb5/copyright.h>
 #include <krb5/krb5.h>
+#include <stdio.h>
 #include "des_int.h"
 #include "tables.h"
 
diff --git a/src/lib/crypto/des/misc.c b/src/lib/crypto/des/misc.c
index c596f82ebc..65d8c17dad 100644
--- a/src/lib/crypto/des/misc.c
+++ b/src/lib/crypto/des/misc.c
@@ -2,10 +2,10 @@
  * $Source$
  * $Author$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1988,1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information,
- * please seethe file <mit-copyright.h>.
+ * please seethe file <krb5/copyright.h>.
  *
  * This file contains most of the routines needed by the various
  * make_foo programs, to account for bit- and byte-ordering on
@@ -14,10 +14,9 @@
  */
 
 #include <krb5/copyright.h>
-#include <stdio.h>
-#include <sys/errno.h>
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
+#include <stdio.h>
 
 #include "des_int.h"
 
diff --git a/src/lib/crypto/des/new_rn_key.c b/src/lib/crypto/des/new_rn_key.c
index 58f98fe72f..2f663b53f9 100644
--- a/src/lib/crypto/des/new_rn_key.c
+++ b/src/lib/crypto/des/new_rn_key.c
@@ -2,10 +2,10 @@
  * $Source$
  * $Author$
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1988,1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * <krb5/copyright.h>.
  *
  * New pseudo-random key generator, using DES encryption to make the
  * pseudo-random cycle as hard to break as DES.
@@ -18,10 +18,10 @@
 
 #if !defined(lint) && !defined(SABER)
 static char new_rnd_key_c[] =
-"$Header$";
+"$Id$";
 #endif	/* !lint & !SABER */
 
-#include <mit-copyright.h>
+#include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
 #include "des_int.h"
diff --git a/src/lib/crypto/des/process_ky.c b/src/lib/crypto/des/process_ky.c
index 5060911f92..b21228c5ff 100644
--- a/src/lib/crypto/des/process_ky.c
+++ b/src/lib/crypto/des/process_ky.c
@@ -5,7 +5,7 @@
  * Copyright 1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see the file
- * <krb5/mit-copyright.h>.
+ * <krb5/copyright.h>.
  *
  */
 
@@ -16,11 +16,8 @@ static char des_prc_key_c[] =
 
 #include <krb5/copyright.h>
 
-#include <sys/errno.h>
-
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
-#include <krb5/krb5_err.h>
 
 #include "des_int.h"
 
diff --git a/src/lib/crypto/des/random_key.c b/src/lib/crypto/des/random_key.c
index 84930d79a9..468610fe11 100644
--- a/src/lib/crypto/des/random_key.c
+++ b/src/lib/crypto/des/random_key.c
@@ -5,7 +5,7 @@
  * Copyright 1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see the file
- * <krb5/mit-copyright.h>.
+ * <krb5/copyright.h>.
  *
  */
 
@@ -16,8 +16,6 @@ static char des_ran_key_c[] =
 
 #include <krb5/copyright.h>
 
-#include <sys/errno.h>
-
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c
index d3732fd158..33fa0d8581 100644
--- a/src/lib/crypto/des/string2key.c
+++ b/src/lib/crypto/des/string2key.c
@@ -5,7 +5,7 @@
  * Copyright 1990 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see the file
- * <krb5/mit-copyright.h>.
+ * <krb5/copyright.h>.
  *
  * Wrapper for the V4 libdes for use with kerberos V5.
  */
@@ -17,10 +17,7 @@ static char des_st2_key_c[] =
 
 #include <krb5/copyright.h>
 
-#include <sys/errno.h>
-
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
 #include <krb5/ext-proto.h>
 
 #include "des_int.h"
diff --git a/src/lib/crypto/des/verify.c b/src/lib/crypto/des/verify.c
index a4e6e1b065..eab24fae13 100644
--- a/src/lib/crypto/des/verify.c
+++ b/src/lib/crypto/des/verify.c
@@ -19,14 +19,11 @@ static char rcsid_verify_c[] =
 "$Id$";
 #endif	/*lint*/
 
-#include <mit-copyright.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
+#include <krb5/copyright.h>
 #include <krb5/krb5.h>
-#include <krb5/mit-des.h>
-#include <krb5/krb5_err.h>
 #include <krb5/ext-proto.h>
+#include <krb5/mit-des.h>
+#include <stdio.h>
 #include <com_err.h>
 
 extern int errno;
diff --git a/src/lib/crypto/des/weak_key.c b/src/lib/crypto/des/weak_key.c
index 5aa19d1038..e46490af3b 100644
--- a/src/lib/crypto/des/weak_key.c
+++ b/src/lib/crypto/des/weak_key.c
@@ -5,7 +5,7 @@
  * Copyright 1989 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * <krb5/copyright.h>.
  *
  * Under U.S. law, this software may not be exported outside the US
  * without license from the U.S. Commerce department.
@@ -17,9 +17,10 @@
 
 #if !defined(lint) && !defined(SABER)
 static char weak_key_c[] =
-"$Header$";
+"$Id$";
 #endif	/* !lint & !SABER */
 
+#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 #include "des_int.h"
diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c
index 683c34bedb..95c92d9f5c 100644
--- a/src/lib/kdb/decrypt_key.c
+++ b/src/lib/kdb/decrypt_key.c
@@ -17,9 +17,7 @@ static char rcsid_decrypt_key_c [] =
 
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
-#include <krb5/kdb5_err.h>
 #include <krb5/ext-proto.h>
-#include <errno.h>
 
 
 /*
diff --git a/src/lib/kdb/encrypt_key.c b/src/lib/kdb/encrypt_key.c
index b607524335..f2c2c5e1b8 100644
--- a/src/lib/kdb/encrypt_key.c
+++ b/src/lib/kdb/encrypt_key.c
@@ -17,9 +17,7 @@ static char rcsid_encrypt_key_c [] =
 
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
-#include <krb5/kdb5_err.h>
 #include <krb5/ext-proto.h>
-#include <errno.h>
 
 /*
  * Encrypt a key for storage in the database.  "eblock" is used
diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c
index 809f417f31..43e28f303c 100644
--- a/src/lib/kdb/fetch_mkey.c
+++ b/src/lib/kdb/fetch_mkey.c
@@ -18,15 +18,11 @@ static char rcsid_fetch_mkey_c[] =
 
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
-#include <krb5/kdb5_err.h>
 #include <krb5/kdb.h>
-#include <errno.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 #include <krb5/ext-proto.h>
+#include <krb5/sysincl.h>		/* for MAXPATHLEN */
 #include "kdbint.h"
-#include <sys/param.h>			/* XXX for MAXPATHLEN */
 
 /* these are available to other funcs, and the pointers may be reassigned */
 
diff --git a/src/lib/kdb/kdb_dbm.c b/src/lib/kdb/kdb_dbm.c
index af0182040c..355e1c7eb2 100644
--- a/src/lib/kdb/kdb_dbm.c
+++ b/src/lib/kdb/kdb_dbm.c
@@ -14,24 +14,12 @@ static char rcsid_krb_dbm_c[] =
 #endif	/* lint */
 
 #include <krb5/copyright.h>
-
-#include <krb5/dbm.h>
-
-#include <stdio.h>
-
-/* XXX these should go into a central system include file */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <errno.h>
-
 #include <krb5/krb5.h>
+#include <krb5/dbm.h>
 #include <krb5/kdb.h>
 #include <krb5/kdb_dbm.h>
-#include <krb5/kdb5_err.h>
-
 #include <krb5/ext-proto.h>
+#include <krb5/sysincl.h>
 
 #define KRB5_DBM_MAX_RETRY 5
 
diff --git a/src/lib/kdb/setup_mkey.c b/src/lib/kdb/setup_mkey.c
index 451221a9c7..182a6ede3d 100644
--- a/src/lib/kdb/setup_mkey.c
+++ b/src/lib/kdb/setup_mkey.c
@@ -19,7 +19,6 @@ static char rcsid_setup_mkey_c[] =
 #include <krb5/krb5.h>
 #include <krb5/kdb.h>
 #include <krb5/ext-proto.h>
-#include <errno.h>
 
 /*
  * Given a key name and a realm name, construct a principal which can be used
diff --git a/src/lib/kdb/store_mkey.c b/src/lib/kdb/store_mkey.c
index f3f99a4b3e..70eb35cc8d 100644
--- a/src/lib/kdb/store_mkey.c
+++ b/src/lib/kdb/store_mkey.c
@@ -19,15 +19,10 @@ static char rcsid_store_mkey_c[] =
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/kdb.h>
-#include <errno.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 #include <krb5/ext-proto.h>
 #include "kdbint.h"
-#include <sys/param.h>			/* XXX for MAXPATHLEN */
-#ifdef unix
-#include <sys/file.h>			/* XX for umask prototype */
-#endif
+#include <krb5/sysincl.h>		/* for MAXPATHLEN */
 
 /*
  * Put the KDC database master key into a file.  If keyfile is NULL,
diff --git a/src/lib/kdb/verify_mky.c b/src/lib/kdb/verify_mky.c
index 912e99f1fb..5b0872bd56 100644
--- a/src/lib/kdb/verify_mky.c
+++ b/src/lib/kdb/verify_mky.c
@@ -18,9 +18,6 @@ static char rcsid_verify_mky_c[] =
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/kdb.h>
-#include <krb5/krb5_err.h>
-#include <krb5/kdb5_err.h>
-#include <errno.h>
 #include <krb5/ext-proto.h>
 
 /*