* *.[ch]: Avoid <krb5/...> and <com_err.h> includes

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

15 files changed, 20 insertions, 94 deletions

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index c9d2e00..8fc248c 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:27:11 1995  John Gilmore  (gnu at toad.com)
+
+	* *.[ch]:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Feb 10 14:35:42 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* do_tgs_req.c (process_tgs_req): krb5_use_keytype() was being
diff --git a/src/kdc/dispatch.c b/src/kdc/dispatch.c
index 8e29a76..22b6cd0 100644
--- a/src/kdc/dispatch.c
+++ b/src/kdc/dispatch.c
@@ -23,11 +23,7 @@
  * Dispatch an incoming packet.
  */
 
-
-#include <krb5/copyright.h>
-#include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <krb5/kdb.h>
+#include "k5-int.h"
 #include <syslog.h>
 #include "kdc_util.h"
 #include "extern.h"
diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
index 15cf259..42ceaa1 100644
--- a/src/kdc/do_as_req.c
+++ b/src/kdc/do_as_req.c
@@ -24,16 +24,8 @@
  * KDC Routines to deal with AS_REQ's
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/preauth.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/osconf.h>
-#include <com_err.h>
-
-#include <krb5/ext-proto.h>
+#include "k5-int.h"
+#include "com_err.h"
 
 #include <syslog.h>
 #ifdef KRB5_USE_INET
diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
index 489a306..5b3dac6 100644
--- a/src/kdc/do_tgs_req.c
+++ b/src/kdc/do_tgs_req.c
@@ -24,14 +24,8 @@
  * KDC Routines to deal with TGS_REQ's
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/osconf.h>
-#include <krb5/ext-proto.h>
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 
 #include <syslog.h>
 #ifdef KRB5_USE_INET
diff --git a/src/kdc/extern.c b/src/kdc/extern.c
index e809945..9c070f2 100644
--- a/src/kdc/extern.c
+++ b/src/kdc/extern.c
@@ -23,14 +23,7 @@
  * allocations of extern stuff
  */
 
-
-#include <krb5/copyright.h>
-
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/osconf.h>
-
+#include "k5-int.h"
 #include "extern.h"
 
 /* real declarations of KDC's externs */
diff --git a/src/kdc/extern.h b/src/kdc/extern.h
index 81c5f5c..6bb9092 100644
--- a/src/kdc/extern.h
+++ b/src/kdc/extern.h
@@ -23,8 +23,6 @@
  * <<< Description >>>
  */
 
-#include <krb5/copyright.h>
-
 #ifndef __KRB5_KDC_EXTERN__
 #define __KRB5_KDC_EXTERN__
 
diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
index c631d44..577c7b0 100644
--- a/src/kdc/kdc_util.c
+++ b/src/kdc/kdc_util.c
@@ -24,17 +24,10 @@
  * Utility functions for the KDC implementation.
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/asn1.h>
-
+#include "k5-int.h"
 #include "kdc_util.h"
 #include "extern.h"
-
-#include <krb5/ext-proto.h>
 #include <stdio.h>
-
 #include <syslog.h>
 
 /*
diff --git a/src/kdc/kdc_util.h b/src/kdc/kdc_util.h
index e2e8e8c..443b1d1 100644
--- a/src/kdc/kdc_util.h
+++ b/src/kdc/kdc_util.h
@@ -23,8 +23,6 @@
  * Declarations for policy.c
  */
 
-#include <krb5/copyright.h>
-
 #ifndef __KRB5_KDC_UTIL__
 #define __KRB5_KDC_UTIL__
 
diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c
index d921752..5f4b590 100644
--- a/src/kdc/kerberos_v4.c
+++ b/src/kdc/kerberos_v4.c
@@ -25,8 +25,7 @@
 
 #ifdef KRB4
 
-#include <krb5/config.h>
-#include <krb5/sysincl.h>
+#include "k5-int.h"
 
 #if __STDC__ || defined(STDARG_PROTOTYPES)
 #include <stdarg.h>
@@ -385,15 +384,7 @@ main(argc, argv)
 /*
  * v5 include files:
  */
-#include <krb5/krb5.h>
-#include <krb5/base-defs.h>
-#include <krb5/encryption.h>
-#include <krb5/wordsize.h>
-#include <krb5/mit-des.h>
-#include <krb5/kdb.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <com_err.h>
+#include "com_err.h"
 #include "extern.h"		/* to pick up master_princ */
 
 static krb5_error_code retval; 
diff --git a/src/kdc/main.c b/src/kdc/main.c
index 12c40f0..325627e 100644
--- a/src/kdc/main.c
+++ b/src/kdc/main.c
@@ -23,30 +23,18 @@
  * Main procedure body for the KDC server process.
  */
 
-
 #include <stdio.h>
 #include <syslog.h>
 #include <signal.h>
 #include <errno.h>
 
-#include <com_err.h>
+#include "com_err.h"
 /* for STDC, com_err gets varargs/stdarg */
 #ifndef __STDC__
 #include <varargs.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/osconf.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/ext-proto.h>
-
-#include <krb5/config.h>
-#ifdef PROVIDE_DES_CBC_CRC
-#include <krb5/mit-des.h>
-#endif
-
+#include "k5-int.h"
 #include "kdc_util.h"
 #include "extern.h"
 #include "kdc5_err.h"
diff --git a/src/kdc/network.c b/src/kdc/network.c
index 35b3501..e08777f 100644
--- a/src/kdc/network.c
+++ b/src/kdc/network.c
@@ -23,14 +23,8 @@
  * Network code for Kerberos v5 KDC.
  */
 
-
-#include <krb5/copyright.h>
-#include <krb5/osconf.h>
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include "kdc_util.h"
 #include "extern.h"
 #include "kdc5_err.h"
diff --git a/src/kdc/policy.c b/src/kdc/policy.c
index 55d99b7..db5df26 100644
--- a/src/kdc/policy.c
+++ b/src/kdc/policy.c
@@ -23,13 +23,7 @@
  * Policy decision routines for KDC.
  */
 
-
-#include <krb5/copyright.h>
-
-
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-
+#include "k5-int.h"
 #include "kdc_util.h"
 
 int
diff --git a/src/kdc/policy.h b/src/kdc/policy.h
index 2d90aaa..dd359c9 100644
--- a/src/kdc/policy.h
+++ b/src/kdc/policy.h
@@ -23,8 +23,6 @@
  * Declarations for policy.c
  */
 
-#include <krb5/copyright.h>
-
 #ifndef __KRB5_KDC_POLICY__
 #define __KRB5_KDC_POLICY__
 
diff --git a/src/kdc/replay.c b/src/kdc/replay.c
index 922ff61..05f070e 100644
--- a/src/kdc/replay.c
+++ b/src/kdc/replay.c
@@ -25,11 +25,7 @@
  *
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
+#include "k5-int.h"
 #include "kdc_util.h"
 #include "extern.h"
 
diff --git a/src/kdc/rtest.c b/src/kdc/rtest.c
index a6315b8..68835bd 100644
--- a/src/kdc/rtest.c
+++ b/src/kdc/rtest.c
@@ -23,10 +23,7 @@
  *
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/kdb.h>
+#include "k5-int.h"
 #include <stdio.h>
 #include "kdc_util.h"