From 77495b274b2926f0c27b9bea8822fe66dce4e3fe Mon Sep 17 00:00:00 2001
From: John Gilmore <gnu@toad.com>
Date: Tue, 28 Feb 1995 10:12:28 +0000
Subject: [PATCH] Avoid <krb5/...> and <com_err.h> includes

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5028 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/admin/aname/ChangeLog        |  4 ++++
 src/admin/aname/kdb5_anadd.c     |  8 ++------
 src/admin/convert/ChangeLog      |  4 ++++
 src/admin/convert/kdb5_convert.c | 13 ++-----------
 src/admin/create/ChangeLog       |  4 ++++
 src/admin/create/kdb5_create.c   | 13 ++-----------
 src/admin/destroy/ChangeLog      |  4 ++++
 src/admin/destroy/kdb5_destroy.c |  9 ++-------
 src/admin/edit/ChangeLog         |  5 +++++
 src/admin/edit/dump.c            | 16 +++-------------
 src/admin/edit/dumpv4.c          | 14 ++------------
 src/admin/edit/kdb5_edit.c       | 12 ++----------
 src/admin/edit/ss_wrapper.c      |  2 +-
 src/admin/edit/tcl_wrapper.c     |  2 +-
 src/admin/edit/util.c            |  6 +-----
 src/admin/stash/ChangeLog        |  4 ++++
 src/admin/stash/kdb5_stash.c     | 11 ++---------
 src/clients/kdestroy/ChangeLog   |  4 ++++
 src/clients/kdestroy/kdestroy.c  |  6 ++----
 src/clients/kinit/ChangeLog      |  4 ++++
 src/clients/kinit/kinit.c        |  6 ++----
 src/clients/klist/ChangeLog      |  4 ++++
 src/clients/klist/klist.c        |  6 ++----
 src/clients/ksu/ChangeLog        |  4 ++++
 src/clients/ksu/ksu.h            | 11 ++---------
 25 files changed, 69 insertions(+), 107 deletions(-)

diff --git a/src/admin/aname/ChangeLog b/src/admin/aname/ChangeLog
index 1b816cebb..4475b4411 100644
--- a/src/admin/aname/ChangeLog
+++ b/src/admin/aname/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:04:08 1995  John Gilmore  (gnu at toad.com)
+
+	* kdb5_anadd.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Mon Oct  3 19:11:27 1994  Theodore Y. Ts'o  (tytso@dcl)
 
 	* Makefile.in: Use $(srcdir) to find manual page for make install.
diff --git a/src/admin/aname/kdb5_anadd.c b/src/admin/aname/kdb5_anadd.c
index a5bbe78d9..2849abc97 100644
--- a/src/admin/aname/kdb5_anadd.c
+++ b/src/admin/aname/kdb5_anadd.c
@@ -24,13 +24,9 @@
  * Program to add/delete entries to/from the aname translation database.
  */
 
-#include <krb5/krb5.h>
-#include <krb5/osconf.h>
-#include <krb5/sysincl.h>
-#include <krb5/ext-proto.h>
-#include <krb5/dbm.h>
+#include "k5-int.h"
 #include <sys/file.h>
-#include <com_err.h>
+#include "com_err.h"
 #include <stdio.h>
 #include <errno.h>
 
diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog
index e89f280a7..d07fa8105 100644
--- a/src/admin/convert/ChangeLog
+++ b/src/admin/convert/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:04:57 1995  John Gilmore  (gnu at toad.com)
+
+	* kdb5_convert.c:  Avoid <krb5/...> and <com_err.h> includes.	
+
 Tue Nov 15 23:55:56 1994  Mark Eichin  (eichin@cygnus.com)
 
 	* kdb5_convert.c (enter_in_v5_db): use the correct instance for
diff --git a/src/admin/convert/kdb5_convert.c b/src/admin/convert/kdb5_convert.c
index 62274e08f..eccf2282b 100644
--- a/src/admin/convert/kdb5_convert.c
+++ b/src/admin/convert/kdb5_convert.c
@@ -39,19 +39,10 @@ static C_Block master_key;
 static Key_schedule master_key_schedule;
 static long master_key_version;
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/osconf.h>
-#include <krb5/sysincl.h>
-
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <stdio.h>
 
-#include <krb5/ext-proto.h>
-
 #include <netinet/in.h>			/* ntohl */
 
 #define PROGNAME argv[0]
diff --git a/src/admin/create/ChangeLog b/src/admin/create/ChangeLog
index 8e5b29e5d..ade471ba2 100644
--- a/src/admin/create/ChangeLog
+++ b/src/admin/create/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:05:32 1995  John Gilmore  (gnu at toad.com)
+
+	* kdb5_create.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
     * Added krb5_context to all krb5_routines
diff --git a/src/admin/create/kdb5_create.c b/src/admin/create/kdb5_create.c
index 9cf726c3d..eaaf248a9 100644
--- a/src/admin/create/kdb5_create.c
+++ b/src/admin/create/kdb5_create.c
@@ -24,19 +24,10 @@
  * Generate (from scratch) a Kerberos KDC database.
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/osconf.h>
-
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <stdio.h>
 
-
-#include <krb5/ext-proto.h>
-
 enum ap_op {
     NULL_KEY,				/* setup null keys */
     MASTER_KEY,				/* use master key as new key */
diff --git a/src/admin/destroy/ChangeLog b/src/admin/destroy/ChangeLog
index 03424276b..3f338a083 100644
--- a/src/admin/destroy/ChangeLog
+++ b/src/admin/destroy/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:05:53 1995  John Gilmore  (gnu at toad.com)
+
+	* kdb5_destroy.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
     * Added krb5_context to all krb5_routines
diff --git a/src/admin/destroy/kdb5_destroy.c b/src/admin/destroy/kdb5_destroy.c
index d10b2ffab..7eeb04c72 100644
--- a/src/admin/destroy/kdb5_destroy.c
+++ b/src/admin/destroy/kdb5_destroy.c
@@ -26,14 +26,9 @@
  * This version knows about DBM format databases.
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
 #include <stdio.h>
-
-#include <com_err.h>
-#include <krb5/ext-proto.h>
-#include <krb5/sysincl.h>		/* for MAXPATHLEN */
+#include "com_err.h"
 
 extern int errno;
 
diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index ec2ec45e6..60baab178 100644
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 28 02:06:26 1995  John Gilmore  (gnu at toad.com)
+
+	* dump.c, dumpv4.c, kdb5_edit.c, ss_wrapper.c, tcl_wrapper.c,
+	util.c: Avoid <krb5/...> includes.
+
 Thu Feb 23 19:52:35 1995  Mark Eichin  (eichin@cygnus.com)
 
 	* kdb5_edit.c: add struct timeb and sys/timeb includes from
diff --git a/src/admin/edit/dump.c b/src/admin/edit/dump.c
index 90fb78156..2f888c450 100644
--- a/src/admin/edit/dump.c
+++ b/src/admin/edit/dump.c
@@ -24,20 +24,10 @@
  * Dump a KDC database
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/config.h>
-#include <krb5/sysincl.h>		/* for MAXPATHLEN */
-#include <krb5/ext-proto.h>
-#include <krb5/func-proto.h>
-
-#include <com_err.h>
-#include <stdio.h>
-
+#include "k5-int.h"
+#include "com_err.h"
 #include "kdb5_edit.h"
+#include <stdio.h>
 
 struct dump_record {
 	char	*comerr_name;
diff --git a/src/admin/edit/dumpv4.c b/src/admin/edit/dumpv4.c
index eec85f52d..3924f0f56 100644
--- a/src/admin/edit/dumpv4.c
+++ b/src/admin/edit/dumpv4.c
@@ -32,19 +32,9 @@
 /* MKEYFILE is now defined in kdc.h */
 #include <kdc.h>
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/config.h>
-#include <krb5/sysincl.h>		/* for MAXPATHLEN */
-#include <krb5/ext-proto.h>
-#include <krb5/func-proto.h>
-
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <stdio.h>
-
 #include "kdb5_edit.h"
 
 struct dump_record {
diff --git a/src/admin/edit/kdb5_edit.c b/src/admin/edit/kdb5_edit.c
index c734eef4c..545daf8d3 100644
--- a/src/admin/edit/kdb5_edit.c
+++ b/src/admin/edit/kdb5_edit.c
@@ -24,16 +24,8 @@
  * Edit a KDC database.
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/config.h>
-#include <krb5/sysincl.h>		/* for MAXPATHLEN */
-#include <krb5/ext-proto.h>
-
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <stdio.h>
 #include <time.h>
 /* timeb is part of the interface to get_date. */
diff --git a/src/admin/edit/ss_wrapper.c b/src/admin/edit/ss_wrapper.c
index 3f86c45a4..4ac58eee0 100644
--- a/src/admin/edit/ss_wrapper.c
+++ b/src/admin/edit/ss_wrapper.c
@@ -24,7 +24,7 @@
  * ss wrapper for kdb5_edit
  */
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include "kdb5_edit.h"
 #include <ss/ss.h>
 #include <stdio.h>
diff --git a/src/admin/edit/tcl_wrapper.c b/src/admin/edit/tcl_wrapper.c
index 55b08d4e8..a8f0722cc 100644
--- a/src/admin/edit/tcl_wrapper.c
+++ b/src/admin/edit/tcl_wrapper.c
@@ -24,7 +24,7 @@
  * Tcl wrapper for kdb5_edit
  */
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include "kdb5_edit.h"
 #include <tcl.h>
 
diff --git a/src/admin/edit/util.c b/src/admin/edit/util.c
index cc9597e48..3a23c9a84 100644
--- a/src/admin/edit/util.c
+++ b/src/admin/edit/util.c
@@ -30,11 +30,7 @@
  * 
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/los-proto.h>
-#include <krb5/ext-proto.h>
-
+#include "k5-int.h"
 #include "./kdb5_edit.h"
 
 #if defined(sysvimp) || ( defined(mips) && defined(SYSTYPE_BSD43)) || (defined(vax) && !defined(ultrix))
diff --git a/src/admin/stash/ChangeLog b/src/admin/stash/ChangeLog
index a5b7ef753..51a88d7a1 100644
--- a/src/admin/stash/ChangeLog
+++ b/src/admin/stash/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:08:04 1995  John Gilmore  (gnu at toad.com)
+
+	* kdb5_stach.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
     * Added krb5_context to all krb5_routines
diff --git a/src/admin/stash/kdb5_stash.c b/src/admin/stash/kdb5_stash.c
index a13ec0929..1cc87def0 100644
--- a/src/admin/stash/kdb5_stash.c
+++ b/src/admin/stash/kdb5_stash.c
@@ -24,15 +24,8 @@
  * Store the master database key in a file.
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/sysincl.h>
-#include <krb5/osconf.h>
-
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <stdio.h>
 
 extern int errno;
diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index 356863f3c..f64f8edca 100644
--- a/src/clients/kdestroy/ChangeLog
+++ b/src/clients/kdestroy/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:10:17 1995  John Gilmore  (gnu at toad.com)
+
+	* kdestroy.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Feb 10 18:46:17 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* Makefile.in (ISODELIB): Remove ISODE cruft.  Use $(LIBS) so that
diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
index 2b8ff4c73..9e4714d94 100644
--- a/src/clients/kdestroy/kdestroy.c
+++ b/src/clients/kdestroy/kdestroy.c
@@ -26,10 +26,8 @@
 
 #include <stdio.h>
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-
-#include <com_err.h>
+#include "krb5.h"
+#include "com_err.h"
 
 extern int optind;
 extern char *optarg;
diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog
index fb717996a..d5ce03ac4 100644
--- a/src/clients/kinit/ChangeLog
+++ b/src/clients/kinit/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:10:44 1995  John Gilmore  (gnu at toad.com)
+
+	* kinit.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Mon Feb 13 23:50:52 1995  Theodore Y. Ts'o  (tytso@dcl)
 
 	* Makefile.in: Use $(LD) instead of $(CC) when linking.
diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c
index de6c2acc1..9a2572223 100644
--- a/src/clients/kinit/kinit.c
+++ b/src/clients/kinit/kinit.c
@@ -25,12 +25,10 @@
  */
 
 #include <stdio.h>
-#include <com_err.h>
+#include "com_err.h"
 #include <pwd.h>
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
+#include "krb5.h"
 
 #define KRB5_DEFAULT_OPTIONS 0
 #define KRB5_DEFAULT_LIFE 60*60*8 /* 8 hours */
diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index 3fde40fc0..fe6412b46 100644
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:11:02 1995  John Gilmore  (gnu at toad.com)
+
+	* klist.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Feb 10 18:44:44 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* Makefile.in (ISODELIB): Remove ISODE cruft.  Use $(LIBS) so that
diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
index bfc8df7a9..e59b24ce9 100644
--- a/src/clients/klist/klist.c
+++ b/src/clients/klist/klist.c
@@ -25,10 +25,8 @@
  */
 
 #include <stdio.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <com_err.h>
+#include "krb5.h"
+#include "com_err.h"
 #include <time.h>
 
 extern int optind;
diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog
index 92a17a0a5..3e9245244 100644
--- a/src/clients/ksu/ChangeLog
+++ b/src/clients/ksu/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:11:21 1995  John Gilmore  (gnu at toad.com)
+
+	* ksu.h:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Feb 17 18:10:04 1995 Chris Provenzano  (proven@mit.edu)
 
 	* krb_auth_su.c krb5_auth_check()) Call krb5_get_cred_from_kdc()
diff --git a/src/clients/ksu/ksu.h b/src/clients/ksu/ksu.h
index 013230fba..8fa0acc21 100644
--- a/src/clients/ksu/ksu.h
+++ b/src/clients/ksu/ksu.h
@@ -25,16 +25,9 @@
  * KSU was writen by:  Ari Medvinsky, ari@isi.edu
  */
 
-#include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/dbm.h>
-
-#include <krb5/osconf.h>
-#include <krb5/sysincl.h>
+#include "k5-int.h"
 #include <stdio.h>
-#include <com_err.h>
+#include "com_err.h"
 #include <sys/types.h> 
 #include <sys/param.h>
 #include <pwd.h>
-- 
2.26.2