Avoid <krb5/....> includes

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

8 files changed, 12 insertions, 36 deletions

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 6bd53008b0..acf27e6384 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 28 00:30:10 1995  John Gilmore  (gnu at toad.com)
+
+	* decrypt_key.c, encrypt_key.c, fetch_mkey.c, kdb_dbm.c,
+	setup_mkey.c, store-mkey.c, verify_mky.c:  Avoid <krb5/...> includes.
+
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
     * Added krb5_context to all krb5_routines
diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c
index 7f76d1d08d..cb901b677c 100644
--- a/src/lib/kdb/decrypt_key.c
+++ b/src/lib/kdb/decrypt_key.c
@@ -24,11 +24,7 @@
  * krb5_kdb_encrypt_key(), krb5_kdb_decrypt_key functions
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/kdb.h>
-
+#include "k5-int.h"
 
 /*
  * Decrypt a key from storage in the database.  "eblock" is used
diff --git a/src/lib/kdb/encrypt_key.c b/src/lib/kdb/encrypt_key.c
index ebf8c17b99..277983e345 100644
--- a/src/lib/kdb/encrypt_key.c
+++ b/src/lib/kdb/encrypt_key.c
@@ -24,10 +24,7 @@
  * krb5_kdb_encrypt_key(), krb5_kdb_decrypt_key functions
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/kdb.h>
+#include "k5-int.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 904d179ab7..37ae53a5a3 100644
--- a/src/lib/kdb/fetch_mkey.c
+++ b/src/lib/kdb/fetch_mkey.c
@@ -25,12 +25,7 @@
  * Fetch a database master key from somewhere.
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/los-proto.h>
-#include <krb5/ext-proto.h>
-#include <krb5/sysincl.h>		/* for MAXPATHLEN */
+#include "k5-int.h"
 #include "kdbint.h"
 
 /* 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 8092a30334..69d202655e 100644
--- a/src/lib/kdb/kdb_dbm.c
+++ b/src/lib/kdb/kdb_dbm.c
@@ -26,18 +26,11 @@
 #include <unistd.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/dbm.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/ext-proto.h>
-#include <krb5/sysincl.h>
-#include <krb5/libos.h>
+#include "k5-int.h"
 #include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <utime.h>
-#include <krb5/config.h>
 
 #define OLD_COMPAT_VERSION_1
 
diff --git a/src/lib/kdb/setup_mkey.c b/src/lib/kdb/setup_mkey.c
index bd619a57d8..ece8e2ccad 100644
--- a/src/lib/kdb/setup_mkey.c
+++ b/src/lib/kdb/setup_mkey.c
@@ -24,10 +24,7 @@
  * krb5_kdb_setup_mkey()
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/ext-proto.h>
+#include "k5-int.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 a6201db1fa..25dc5c3ecd 100644
--- a/src/lib/kdb/store_mkey.c
+++ b/src/lib/kdb/store_mkey.c
@@ -27,12 +27,8 @@
 
 
 #include <errno.h>
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/los-proto.h>
-#include <krb5/ext-proto.h>
+#include "k5-int.h"
 #include "kdbint.h"
-#include <krb5/sysincl.h>		/* for MAXPATHLEN */
 
 /* Just in case sysincl.h didn't get it */
 
diff --git a/src/lib/kdb/verify_mky.c b/src/lib/kdb/verify_mky.c
index 3d90fc3e40..4ef8304e3c 100644
--- a/src/lib/kdb/verify_mky.c
+++ b/src/lib/kdb/verify_mky.c
@@ -24,10 +24,7 @@
  * krb5_db_verify_master_key();
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/ext-proto.h>
+#include "k5-int.h"
 
 /*
  * Verify that the master key in *mkey matches the database entry