fix include files

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

8 files changed, 17 insertions, 47 deletions

diff --git a/src/admin/create/kdb5_create.c b/src/admin/create/kdb5_create.c
index 28e123ff9..f0a2c5ebd 100644
--- a/src/admin/create/kdb5_create.c
+++ b/src/admin/create/kdb5_create.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>.
  *
  * Generate (from scratch) a Kerberos KDC database.
  */
@@ -19,16 +19,13 @@ static char rcsid_kdb_create_c[] =
 #include <krb5/krb5.h>
 #include <krb5/kdb.h>
 #include <krb5/kdb_dbm.h>
-#include <krb5/krb5_err.h>
-#include <krb5/kdb5_err.h>
-#include <krb5/isode_err.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 #include <krb5/asn1.h>
 #include <krb5/config.h>
 
 #include <com_err.h>
-#include <errno.h>
+#include <stdio.h>
+
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/admin/destroy/kdb5_destroy.c b/src/admin/destroy/kdb5_destroy.c
index d88263dc3..9ce08c93a 100644
--- a/src/admin/destroy/kdb5_destroy.c
+++ b/src/admin/destroy/kdb5_destroy.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>.
  *
  * kdb_dest(roy): destroy the named database.
  *
@@ -24,14 +24,8 @@ static char rcsid_kdb_dest_c[] =
 #include <stdio.h>
 
 #include <com_err.h>
-#include <krb5/krb5_err.h>
-#include <krb5/kdb5_err.h>
-#include <krb5/isode_err.h>
-
 #include <krb5/ext-proto.h>
-#include <sys/file.h>			/* for unlink() */
-
-#include <sys/param.h>			/* XXX for MAXPATHLEN */
+#include <krb5/sysincl.h>		/* for MAXPATHLEN */
 
 extern int errno;
 
diff --git a/src/admin/edit/kdb5_edit.c b/src/admin/edit/kdb5_edit.c
index 2d9da4987..071b9db4b 100644
--- a/src/admin/edit/kdb5_edit.c
+++ b/src/admin/edit/kdb5_edit.c
@@ -19,20 +19,16 @@ static char rcsid_kdb_edit_c[] =
 #include <krb5/krb5.h>
 #include <krb5/kdb.h>
 #include <krb5/kdb_dbm.h>
-#include <krb5/krb5_err.h>
-#include <krb5/kdb5_err.h>
-#include <krb5/isode_err.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 #include <krb5/asn1.h>
 #include <krb5/config.h>
-#include <sys/param.h>			/* XXX for MAXPATHLEN */
+#include <krb5/sysincl.h>		/* for MAXPATHLEN */
+#include <krb5/ext-proto.h>
 
 #include <com_err.h>
 #include <ss/ss.h>
-#include <errno.h>
+#include <stdio.h>
 
-#include <krb5/ext-proto.h>
 
 #define REALM_SEP	'@'
 #define REALM_SEP_STR	"@"
@@ -619,7 +615,6 @@ int argc;
 char *argv[];
 {
     krb5_error_code retval;
-    krb5_keyblock *tempkey;
     krb5_principal newprinc;
     char yesno[80];
     int one = 1;
diff --git a/src/admin/stash/kdb5_stash.c b/src/admin/stash/kdb5_stash.c
index d9394aedf..34dfb4aae 100644
--- a/src/admin/stash/kdb5_stash.c
+++ b/src/admin/stash/kdb5_stash.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>.
  *
  * Store the master database key in a file.
  */
@@ -19,17 +19,12 @@ static char rcsid_kdb_stash_c[] =
 #include <krb5/krb5.h>
 #include <krb5/kdb.h>
 #include <krb5/kdb_dbm.h>
-#include <krb5/krb5_err.h>
-#include <krb5/kdb5_err.h>
-#include <krb5/isode_err.h>
-
-#include <com_err.h>
-
-#include <stdio.h>
 #include <krb5/ext-proto.h>
 #include <krb5/libos-proto.h>
+#include <krb5/sysincl.h>
 
-#include <sys/file.h>			/* for unlink() */
+#include <com_err.h>
+#include <stdio.h>
 
 extern int errno;
 
diff --git a/src/appl/sample/sclient/sclient.c b/src/appl/sample/sclient/sclient.c
index c9a04b53f..a11eaf385 100644
--- a/src/appl/sample/sclient/sclient.c
+++ b/src/appl/sample/sclient/sclient.c
@@ -19,14 +19,13 @@ static char rcsid_sclient_c [] =
 
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
 #include <krb5/ext-proto.h>
-#include <errno.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 
+#include <stdio.h>
 #include <ctype.h>
 #include <com_err.h>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/src/appl/sample/sserver/sserver.c b/src/appl/sample/sserver/sserver.c
index 4600036a6..339b2795f 100644
--- a/src/appl/sample/sserver/sserver.c
+++ b/src/appl/sample/sserver/sserver.c
@@ -27,13 +27,9 @@ static char rcsid_sserver_c [] =
 
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
 #include <krb5/ext-proto.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 
-#include <errno.h>
-
 #include <ctype.h>
 #include <com_err.h>
 #include <sys/types.h>
diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
index 9f69a2594..e57f0db08 100644
--- a/src/clients/kdestroy/kdestroy.c
+++ b/src/clients/kdestroy/kdestroy.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>.
  *
  * Destroy the contents of your credential cache.
  */
@@ -19,8 +19,6 @@ static char rcsid_klist_c [] =
 
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
-#include <krb5/isode_err.h>
 #include <krb5/ext-proto.h>
 
 #include <com_err.h>
@@ -39,8 +37,7 @@ main(argc, argv)
     int code;
     int errflg=0;
     
-    initialize_krb5_error_table();
-    initialize_isod_error_table();
+    krb5_init_ets();
 
     if (rindex(argv[0], '/'))
 	argv[0] = rindex(argv[0], '/')+1;
diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
index 6b3ab3a0e..a752c61fe 100644
--- a/src/clients/klist/klist.c
+++ b/src/clients/klist/klist.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>.
  *
  * List out the contents of your credential cache.
  */
@@ -19,11 +19,8 @@ static char rcsid_klist_c [] =
 
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
-#include <krb5/isode_err.h>
 #include <krb5/ext-proto.h>
 #include <com_err.h>
-#include <errno.h>
 
 extern int optind;
 extern char *optarg;