Avoid <krb5/....> includes

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

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 69d5aebd6e0ba1138222e4a77f9147fb01b0af2e..4150c66ee144673ac2ed9eb2c76fdecffe72a8dd 100644 (file)
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 00:25:58 1995  John Gilmore  (gnu at toad.com)
+
+       * gssapi.h:  Avoid <krb5/...> includes.
+
 Mon Feb 20 18:50:33 1995 Keith Vetter (keithv@fusion.com)
 
        * Makefile.in: made to work on the PC

diff --git a/src/lib/gssapi/generic/gssapi.h b/src/lib/gssapi/generic/gssapi.h
index edcef24a7224cac34a0e30562848686c267a3740..b8bf1fa1a17f46ff41f7a689889e9abe5769f2e7 100644 (file)
--- a/src/lib/gssapi/generic/gssapi.h
+++ b/src/lib/gssapi/generic/gssapi.h
@@ -24,10 +24,10 @@
 #define _GSSAPI_H_
 
 /* for general config: */
-#include <krb5/config.h>
-#include <krb5/osconf.h>
+#include "k5-config.h"
+#include "osconf.h"
 /* for prototype-related config: */
-#include <krb5/base-defs.h>
+#include "base-defs.h"
 #ifndef NO_STDLIB_H
 #include <stdlib.h>
 #endif

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 651ad5e1b9a094dde29b4690e9c45d0c1d85d349..a5040b5a0000d2be51233bef9621a2fccad4f489 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 00:27:44 1995  John Gilmore  (gnu at toad.com)
+
+       * gssapi_krb5.h, gssapiP_krb5.h: Avoid <krb5/...> includes.
+
 Mon Feb 20 19:53:9 1995 Keith Vetter (keithv@fusion.com)
 
        * accept_s.c: needed temp to avoid sign/unsigned mismatch on the PC.

diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index 86095e714772b312bdd7e705771c55f382dfdc22..453c86b5e00e252ea13deb7bb62c0f57102b648d 100644 (file)
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -23,7 +23,7 @@
 #ifndef _GSSAPIP_KRB5_H_
 #define _GSSAPIP_KRB5_H_
 
-#include <krb5/krb5.h>
+#include "krb5.h"
 #include <memory.h>
 
 /* work around sunos braindamage */
@@ -34,7 +34,7 @@
 #undef minor
 #endif
 
-/* this must be after <krb5/krb5.h>, since krb5 #defines xfree(), too */
+/* this must be after "krb5.h", since krb5 #defines xfree(), too */
 #include "../generic/gssapiP_generic.h"
 #include "gssapi_krb5.h"
 #include "gssapi_err_krb5.h"

diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h
index cbbb00f9258a8f6ec89c5fec479316da9ff8a78a..1f189773f44f04764daaf6b7d731c55e59bf0704 100644 (file)
--- a/src/lib/gssapi/krb5/gssapi_krb5.h
+++ b/src/lib/gssapi/krb5/gssapi_krb5.h
@@ -24,7 +24,7 @@
 #define _GSSAPI_KRB5_H_
 
 #include <gssapi/gssapi_generic.h>
-#include <krb5/krb5.h>
+#include "krb5.h"
 
 extern const gss_OID_desc * const gss_mech_krb5;
 extern const gss_OID_set_desc * const gss_mech_set_krb5;

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 6bd53008b0f70061daa404912c7c7110ca55c46d..acf27e6384c4cecfdcb3ec41a9aaf655468ed37b 100644 (file)
--- 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 7f76d1d08dd64384256454f7c94b4ac49a1f6c70..cb901b677c69fb64955ce8780436baf1988a0171 100644 (file)
--- 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 ebf8c17b99717c1ec8d48f5b3ab4ec3727795029..277983e345b673c2222a97daa59ea4413179e4af 100644 (file)
--- 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 904d179ab715c5dcb53e19177964e194996b4360..37ae53a5a305697f7a051fbd0fecc4b3ed2b5dd4 100644 (file)
--- 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 8092a3033458d078589469fcf2504da5d2038330..69d202655ea8d2a8e7bf13df707978c6bbfa7faf 100644 (file)
--- 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 bd619a57d8e764762a27f76faf8730012d68af3b..ece8e2ccad1affa679ff8108de0cb14d18ff1eae 100644 (file)
--- 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 a6201db1fa92e6c6170a2d0614dffde03ec28982..25dc5c3ecd7e1cb027c9f4a8780f3fc1ebefaddb 100644 (file)
--- 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 3d90fc3e4054af745a1a886f5454b23865ef6792..4ef8304e3c189f02a614060258302367a15e602f 100644 (file)
--- 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

diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 04fd06e4d0c802dfc573f54ae83960014c12ef12..1278a1ea7eebc00087fe5ac7e843d4d818bbc479 100644 (file)
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 28 00:32:48 1995  John Gilmore  (gnu at toad.com)
+
+       * asn1_decode.h, asn1_encode.h, asn1_get.h, asn1_k_decode.h,
+       asn1_k_encode.h, asn1_make.h asn1_misc.h, asn1_buf.h, glue2.c,
+       krb5_decode.c, krb5_encode.c, krbasn1.h:  Avoid <krb5/...> includes.
+
 Tue Feb 21 12:00:00 1995  Keith Vetter (keithv@fusion.com)
 
        * Makefile.in: made to work for the PC

diff --git a/src/lib/krb5/asn.1/asn1_decode.h b/src/lib/krb5/asn.1/asn1_decode.h
index d1bb85b3e52fb6cdf533f2ba3d911abb2456b7f5..2d8f0749539c5ff7b0b725202a45bacd7c7777b3 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_decode.h
+++ b/src/lib/krb5/asn.1/asn1_decode.h
@@ -24,7 +24,7 @@
 #ifndef __ASN1_DECODE_H__
 #define __ASN1_DECODE_H__
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include "krbasn1.h"
 #include "asn1buf.h"
 

diff --git a/src/lib/krb5/asn.1/asn1_encode.h b/src/lib/krb5/asn.1/asn1_encode.h
index 7da6a729f9503ebdba5c7fd672b5086abf8d13e8..f5d8036554c87f91e0d5e954c61d4c398dcb1da5 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_encode.h
+++ b/src/lib/krb5/asn.1/asn1_encode.h
@@ -24,7 +24,7 @@
 #ifndef __ASN1_ENCODE_H__
 #define __ASN1_ENCODE_H__
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include <time.h>
 #include "krbasn1.h"
 #include "asn1buf.h"

diff --git a/src/lib/krb5/asn.1/asn1_get.h b/src/lib/krb5/asn.1/asn1_get.h
index 3e77c4a1a519613d2a95d14b4296db5ae139882a..ac7103d6ea573b83034210fd36b17e3d52b505cd 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_get.h
+++ b/src/lib/krb5/asn.1/asn1_get.h
@@ -26,7 +26,7 @@
 
 /* ASN.1 substructure decoding procedures */
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include "krbasn1.h"
 #include "asn1buf.h"
 

diff --git a/src/lib/krb5/asn.1/asn1_k_decode.h b/src/lib/krb5/asn.1/asn1_k_decode.h
index 1b827536a7d3adfa6807a562821f32a918470c98..b2ccd20ccc5b5a24b9f75b5a68e79d5efe5d848f 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_k_decode.h
+++ b/src/lib/krb5/asn.1/asn1_k_decode.h
@@ -24,7 +24,7 @@
 #ifndef __ASN1_DECODE_KRB5_H__
 #define __ASN1_DECODE_KRB5_H__
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include "krbasn1.h"
 #include "asn1buf.h"
 

diff --git a/src/lib/krb5/asn.1/asn1_k_encode.h b/src/lib/krb5/asn.1/asn1_k_encode.h
index cfba4bc1fc2e9bfe6e5905f5c5c62410c2cdd784..d0000ebdff48b9f082220c721d490c799172a1f3 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_k_encode.h
+++ b/src/lib/krb5/asn.1/asn1_k_encode.h
@@ -24,7 +24,7 @@
 #ifndef __ASN1_ENCODE_KRB5_H__
 #define __ASN1_ENCODE_KRB5_H__
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include <stdio.h>
 #include "asn1buf.h"
 

diff --git a/src/lib/krb5/asn.1/asn1_make.h b/src/lib/krb5/asn.1/asn1_make.h
index 2272d83e5858bd7d9c0525cbd84d8573508fcaa2..6fcf891a893aa20c2536dbed89919220a2e445bc 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_make.h
+++ b/src/lib/krb5/asn.1/asn1_make.h
@@ -24,7 +24,7 @@
 #ifndef __ASN1_MAKE_H__
 #define __ASN1_MAKE_H__
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include "krbasn1.h"
 #include "asn1buf.h"
 

diff --git a/src/lib/krb5/asn.1/asn1_misc.h b/src/lib/krb5/asn.1/asn1_misc.h
index f9c162d89179ff5461f1819f91d0bfb84bc434ea..d1364e343b6efc8032b7b9460335fddd8540e228 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_misc.h
+++ b/src/lib/krb5/asn.1/asn1_misc.h
@@ -24,7 +24,7 @@
 #ifndef __ASN1_MISC_H__
 #define __ASN1_MISC_H__
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include "krbasn1.h"
 
 asn1_error_code INTERFACE asn1_krb5_realm_copy

diff --git a/src/lib/krb5/asn.1/asn1buf.h b/src/lib/krb5/asn.1/asn1buf.h
index 2c0ff17c551de57fbeac9a11be7d5f7f3acc9b69..cd4021210fe95458cb2db7387efcd54b98071aea 100644 (file)
--- a/src/lib/krb5/asn.1/asn1buf.h
+++ b/src/lib/krb5/asn.1/asn1buf.h
@@ -2,8 +2,7 @@
 #ifndef __ASN1BUF_H__
 #define __ASN1BUF_H__
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
+#include "k5-int.h"
 #include "krbasn1.h"
 
 typedef struct code_buffer_rep {

diff --git a/src/lib/krb5/asn.1/glue2.c b/src/lib/krb5/asn.1/glue2.c
index 3267de1cac90a6e655ddfdb1dd442af0b520af6c..2c86fd8e373e02489c067718c579efdc220073bb 100644 (file)
--- a/src/lib/krb5/asn.1/glue2.c
+++ b/src/lib/krb5/asn.1/glue2.c
@@ -1,4 +1,4 @@
-#include <krb5/krb5.h>
+#include "krb5.h"
 
 krb5_data string_list[3] = {
 {14, "ATHENA.MIT.EDU"},

diff --git a/src/lib/krb5/asn.1/krb5_decode.c b/src/lib/krb5/asn.1/krb5_decode.c
index f608a3c45033f91a0c3f5b56c6479f6fa84c6d09..2c1cf4d1ad01ff45f1c64e635a38feb3f2308d17 100644 (file)
--- a/src/lib/krb5/asn.1/krb5_decode.c
+++ b/src/lib/krb5/asn.1/krb5_decode.c
@@ -21,7 +21,7 @@
  * or implied warranty.
  */
 
-#include <krb5.h>
+#include "krb5.h"
 #include "krbasn1.h"
 #include "asn1_k_decode.h"
 #include "asn1_decode.h"

diff --git a/src/lib/krb5/asn.1/krb5_encode.c b/src/lib/krb5/asn.1/krb5_encode.c
index d865f0f08c61818cac1f3a5b3b2a100916dc6782..dc85fdf27696dd8333adc0a271322e90794d42b5 100644 (file)
--- a/src/lib/krb5/asn.1/krb5_encode.c
+++ b/src/lib/krb5/asn.1/krb5_encode.c
@@ -21,7 +21,7 @@
  * or implied warranty.
  */
 
-#include <krb5.h>
+#include "krb5.h"
 #include "asn1_k_encode.h"
 #include "asn1_encode.h"
 #include "krbasn1.h"

diff --git a/src/lib/krb5/asn.1/krbasn1.h b/src/lib/krb5/asn.1/krbasn1.h
index e4243c488b9d612ac0192ac7eb2316111f347d47..faa76fde19379f79eff87da4e5eb77903a842d2f 100644 (file)
--- a/src/lib/krb5/asn.1/krbasn1.h
+++ b/src/lib/krb5/asn.1/krbasn1.h
@@ -1,7 +1,7 @@
 #ifndef __KRBASN1_H__
 #define __KRBASN1_H__
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include <stdio.h>
 #include <errno.h>
 #include <limits.h>