From be7323b29c761710b68104c0ae4004228d7c11c6 Mon Sep 17 00:00:00 2001 From: John Gilmore Date: Tue, 28 Feb 1995 08:35:09 +0000 Subject: [PATCH] Avoid includes git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5007 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/generic/ChangeLog | 4 ++++ src/lib/gssapi/generic/gssapi.h | 6 +++--- src/lib/gssapi/krb5/ChangeLog | 4 ++++ src/lib/gssapi/krb5/gssapiP_krb5.h | 4 ++-- src/lib/gssapi/krb5/gssapi_krb5.h | 2 +- src/lib/kdb/ChangeLog | 5 +++++ src/lib/kdb/decrypt_key.c | 6 +----- src/lib/kdb/encrypt_key.c | 5 +---- src/lib/kdb/fetch_mkey.c | 7 +------ src/lib/kdb/kdb_dbm.c | 9 +-------- src/lib/kdb/setup_mkey.c | 5 +---- src/lib/kdb/store_mkey.c | 6 +----- src/lib/kdb/verify_mky.c | 5 +---- src/lib/krb5/asn.1/ChangeLog | 6 ++++++ src/lib/krb5/asn.1/asn1_decode.h | 2 +- src/lib/krb5/asn.1/asn1_encode.h | 2 +- src/lib/krb5/asn.1/asn1_get.h | 2 +- src/lib/krb5/asn.1/asn1_k_decode.h | 2 +- src/lib/krb5/asn.1/asn1_k_encode.h | 2 +- src/lib/krb5/asn.1/asn1_make.h | 2 +- src/lib/krb5/asn.1/asn1_misc.h | 2 +- src/lib/krb5/asn.1/asn1buf.h | 3 +-- src/lib/krb5/asn.1/glue2.c | 2 +- src/lib/krb5/asn.1/krb5_decode.c | 2 +- src/lib/krb5/asn.1/krb5_encode.c | 2 +- src/lib/krb5/asn.1/krbasn1.h | 2 +- 26 files changed, 44 insertions(+), 55 deletions(-) diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 69d5aebd6..4150c66ee 100644 --- 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 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 edcef24a7..b8bf1fa1a 100644 --- 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 -#include +#include "k5-config.h" +#include "osconf.h" /* for prototype-related config: */ -#include +#include "base-defs.h" #ifndef NO_STDLIB_H #include #endif diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 651ad5e1b..a5040b5a0 100644 --- 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 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 86095e714..453c86b5e 100644 --- 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 +#include "krb5.h" #include /* work around sunos braindamage */ @@ -34,7 +34,7 @@ #undef minor #endif -/* this must be after , 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 cbbb00f92..1f189773f 100644 --- 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 -#include +#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 6bd53008b..acf27e638 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 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 7f76d1d08..cb901b677 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 -#include -#include - +#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 ebf8c17b9..277983e34 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 -#include -#include +#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 904d179ab..37ae53a5a 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 -#include -#include -#include -#include /* 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 8092a3033..69d202655 100644 --- a/src/lib/kdb/kdb_dbm.c +++ b/src/lib/kdb/kdb_dbm.c @@ -26,18 +26,11 @@ #include #endif -#include -#include -#include -#include -#include -#include -#include +#include "k5-int.h" #include #include #include #include -#include #define OLD_COMPAT_VERSION_1 diff --git a/src/lib/kdb/setup_mkey.c b/src/lib/kdb/setup_mkey.c index bd619a57d..ece8e2cca 100644 --- a/src/lib/kdb/setup_mkey.c +++ b/src/lib/kdb/setup_mkey.c @@ -24,10 +24,7 @@ * krb5_kdb_setup_mkey() */ - -#include -#include -#include +#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 a6201db1f..25dc5c3ec 100644 --- a/src/lib/kdb/store_mkey.c +++ b/src/lib/kdb/store_mkey.c @@ -27,12 +27,8 @@ #include -#include -#include -#include -#include +#include "k5-int.h" #include "kdbint.h" -#include /* 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 3d90fc3e4..4ef8304e3 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 -#include -#include +#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 04fd06e4d..1278a1ea7 100644 --- 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 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 d1bb85b3e..2d8f07495 100644 --- 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 +#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 7da6a729f..f5d803655 100644 --- 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 +#include "k5-int.h" #include #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 3e77c4a1a..ac7103d6e 100644 --- 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 +#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 1b827536a..b2ccd20cc 100644 --- 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 +#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 cfba4bc1f..d0000ebdf 100644 --- 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 +#include "k5-int.h" #include #include "asn1buf.h" diff --git a/src/lib/krb5/asn.1/asn1_make.h b/src/lib/krb5/asn.1/asn1_make.h index 2272d83e5..6fcf891a8 100644 --- 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 +#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 f9c162d89..d1364e343 100644 --- 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 +#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 2c0ff17c5..cd4021210 100644 --- 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 -#include +#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 3267de1ca..2c86fd8e3 100644 --- a/src/lib/krb5/asn.1/glue2.c +++ b/src/lib/krb5/asn.1/glue2.c @@ -1,4 +1,4 @@ -#include +#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 f608a3c45..2c1cf4d1a 100644 --- 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 +#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 d865f0f08..dc85fdf27 100644 --- 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 +#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 e4243c488..faa76fde1 100644 --- 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 +#include "k5-int.h" #include #include #include -- 2.26.2