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

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

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index c9d2e00e74f5904b7120e8d296137fe90cd06aa8..8fc248ceec3ec5407459f76ac42758558bda0aa6 100644 (file)
--- 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 8e29a7633a30b2b0dbce6e6fa157a2e01a02d53e..22b6cd0c079277917d8511433cf28ed2d08f2c40 100644 (file)
--- 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 15cf259a413ee88eaec4c6a49ea9b7be6b38a398..42ceaa1bf1f4dd36339d528429b8ab171edde5eb 100644 (file)
--- 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 489a3067739cdace45aacf9291a6fe9bcbe29e75..5b3dac66724e700329333ede7a8405d7cee2912a 100644 (file)
--- 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 e809945975033797222f466eaf5c902d3e90d461..9c070f26027c662cd485b9aec5d68910640b2646 100644 (file)
--- 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 81c5f5cccab492525947f9797ca56b227e0c3d25..6bb9092967fe1d30c5787582a990fb09dacabb8e 100644 (file)
--- 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 c631d443e17c8098edd84bef87913abd49503f35..577c7b08291646c8a2d978991160a19883876de6 100644 (file)
--- 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 e2e8e8cbc9ef0e6a18b089d7f6f7a55a2465581c..443b1d1271e4496752656f9d57fdf82b29999890 100644 (file)
--- 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 d9217522a58b7482ab5d31cfbe0a4ba36462176d..5f4b59030e2f0167331d78638f6a3380a6b11cf3 100644 (file)
--- 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 12c40f0af47b4f9b37d01fc8addaad29cea5bf9f..325627e6080da1c588eb74d4a5594f442ce0e564 100644 (file)
--- 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 35b35016629efe02c5b891a99e393c86ae209bae..e08777f38e57914f05d2a0c234d250b879dad97c 100644 (file)
--- 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 55d99b7557d0d63018ca03814debb122bbd6a548..db5df266987bbbcde65b7f8702c2c32a2ae9b478 100644 (file)
--- 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 2d90aaaf2417ec67033d2e9e89db0ce4b270d978..dd359c96f87ad0653611e3621e5af8874eff2878 100644 (file)
--- 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 922ff61203579ab4debe9bb4a590b3705c8c69e0..05f070e75f49bfa53c54473b2f8d6a360fe69c63 100644 (file)
--- 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 a6315b87c44edf2ae28c96610d1728673cb0619a..68835bd6bc6049f2b2eb8642b0e323ed9ca17268 100644 (file)
--- 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"