diff options
Diffstat (limited to 'src/lib/krb5/krb')
66 files changed, 76 insertions, 274 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index a6c9e65..7e3e5d6 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 28 01:14:57 1995 John Gilmore (gnu at toad.com) + + * *.c: Avoid <krb5/...> includes. + * parse.c: Exdent #ifndef to left margin for old compilers. + Wed Feb 22 17:14:31 1995 Keith Vetter (keithv@fusion.com) * walk_rtr.c (krb5_walk_realm_tree): formal parameter wasn't declared. diff --git a/src/lib/krb5/krb/addr_comp.c b/src/lib/krb5/krb/addr_comp.c index 76d8e91..f63ea02 100644 --- a/src/lib/krb5/krb/addr_comp.c +++ b/src/lib/krb5/krb/addr_comp.c @@ -24,9 +24,7 @@ * krb5_address_compare() */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" /* * If the two addresses are the same, return TRUE, else return FALSE diff --git a/src/lib/krb5/krb/addr_order.c b/src/lib/krb5/krb/addr_order.c index 185f73f..c872c52 100644 --- a/src/lib/krb5/krb/addr_order.c +++ b/src/lib/krb5/krb/addr_order.c @@ -24,9 +24,7 @@ * krb5_address_order() */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" #ifndef min #define min(a,b) ((a) < (b) ? (a) : (b)) diff --git a/src/lib/krb5/krb/addr_srch.c b/src/lib/krb5/krb/addr_srch.c index 1988d08..2e112ea 100644 --- a/src/lib/krb5/krb/addr_srch.c +++ b/src/lib/krb5/krb/addr_srch.c @@ -24,8 +24,7 @@ * krb5_address_search() */ - -#include <krb5/krb5.h> +#include "k5-int.h" /* * if addr is listed in addrlist, or addrlist is null, return TRUE. diff --git a/src/lib/krb5/krb/bld_pr_ext.c b/src/lib/krb5/krb/bld_pr_ext.c index 753bbb7..1eb4f8b 100644 --- a/src/lib/krb5/krb/bld_pr_ext.c +++ b/src/lib/krb5/krb/bld_pr_ext.c @@ -24,9 +24,7 @@ * Build a principal from a list of lengths and strings */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" #if __STDC__ || defined(STDARG_PROTOTYPES) #include <stdarg.h> diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c index b82c43a..6d1048e 100644 --- a/src/lib/krb5/krb/bld_princ.c +++ b/src/lib/krb5/krb/bld_princ.c @@ -24,9 +24,8 @@ * Build a principal from a list of strings */ - /* Need <krb5/config.h> for STDARG_PROTOTYPES */ -#include <krb5/krb5.h> +#include "k5-int.h" #if __STDC__ || defined(STDARG_PROTOTYPES) #include <stdarg.h> @@ -34,8 +33,6 @@ #include <varargs.h> #endif -#include <krb5/ext-proto.h> - krb5_error_code INTERFACE_C krb5_build_principal_va(context, princ, rlen, realm, ap) krb5_context context; diff --git a/src/lib/krb5/krb/chk_trans.c b/src/lib/krb5/krb/chk_trans.c index b326431..e7627ff 100644 --- a/src/lib/krb5/krb/chk_trans.c +++ b/src/lib/krb5/krb/chk_trans.c @@ -21,7 +21,7 @@ */ #include <stdio.h> -#include <krb5/krb5.h> +#include "k5-int.h" #define MAX_REALM_LN 500 diff --git a/src/lib/krb5/krb/compat_recv.c b/src/lib/krb5/krb/compat_recv.c index 9e986c0..0a65e30 100644 --- a/src/lib/krb5/krb/compat_recv.c +++ b/src/lib/krb5/krb/compat_recv.c @@ -33,16 +33,10 @@ * to a V4 sendauth. */ - -#include <krb5/krb5.h> +#include "k5-int.h" #ifndef _MSDOS -#include <krb5/osconf.h> -#include <krb5/kdb.h> -#include <krb5/kdb_dbm.h> -#include <krb5/ext-proto.h> -#include <krb5/los-proto.h> #include <kerberosIV/krb.h> -#include <com_err.h> +#include "com_err.h" #include <errno.h> #include <stdio.h> diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c index 0013080..770df77 100644 --- a/src/lib/krb5/krb/conv_princ.c +++ b/src/lib/krb5/krb/conv_princ.c @@ -30,7 +30,7 @@ * hard-coded in this file. */ -#include <krb5/krb5.h> +#include "k5-int.h" #include <string.h> #include <ctype.h> diff --git a/src/lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c index ad21082..29c97ce 100644 --- a/src/lib/krb5/krb/copy_addrs.c +++ b/src/lib/krb5/krb/copy_addrs.c @@ -24,10 +24,7 @@ * krb5_copy_addresses() */ - -#include <krb5/krb5.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" static krb5_error_code krb5_copy_addr(context, inad, outad) diff --git a/src/lib/krb5/krb/copy_athctr.c b/src/lib/krb5/krb/copy_athctr.c index c303af5..826db0e 100644 --- a/src/lib/krb5/krb/copy_athctr.c +++ b/src/lib/krb5/krb/copy_athctr.c @@ -24,10 +24,7 @@ * krb5_copy_authenticator() */ - -#include <krb5/krb5.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" krb5_error_code INTERFACE krb5_copy_authenticator(context, authfrom, authto) diff --git a/src/lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c index 62b0b61..993d084 100644 --- a/src/lib/krb5/krb/copy_auth.c +++ b/src/lib/krb5/krb/copy_auth.c @@ -24,10 +24,7 @@ * krb5_copy_authdata() */ - -#include <krb5/krb5.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" static krb5_error_code krb5_copy_authdatum(context, inad, outad) diff --git a/src/lib/krb5/krb/copy_cksum.c b/src/lib/krb5/krb/copy_cksum.c index 0e1a250..c7ebb8c 100644 --- a/src/lib/krb5/krb/copy_cksum.c +++ b/src/lib/krb5/krb/copy_cksum.c @@ -24,10 +24,7 @@ * krb5_copy_authenticator() */ - -#include <krb5/krb5.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" krb5_error_code INTERFACE krb5_copy_checksum(context, ckfrom, ckto) diff --git a/src/lib/krb5/krb/copy_creds.c b/src/lib/krb5/krb/copy_creds.c index 7ac47cc..264ca51 100644 --- a/src/lib/krb5/krb/copy_creds.c +++ b/src/lib/krb5/krb/copy_creds.c @@ -24,10 +24,7 @@ * krb5_copy_cred() */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> - +#include "k5-int.h" /* * Copy credentials, allocating fresh storage where needed. diff --git a/src/lib/krb5/krb/copy_data.c b/src/lib/krb5/krb/copy_data.c index 9701067..fedf2dc 100644 --- a/src/lib/krb5/krb/copy_data.c +++ b/src/lib/krb5/krb/copy_data.c @@ -24,9 +24,7 @@ * krb5_copy_data() */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" /* * Copy a data structure, with fresh allocation. diff --git a/src/lib/krb5/krb/copy_key.c b/src/lib/krb5/krb/copy_key.c index f714d86..6e367d4 100644 --- a/src/lib/krb5/krb/copy_key.c +++ b/src/lib/krb5/krb/copy_key.c @@ -24,9 +24,7 @@ * krb5_copy_keyblock() */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" /* * Copy a keyblock, including alloc'ed storage. diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c index 11dee84..48775e2 100644 --- a/src/lib/krb5/krb/copy_princ.c +++ b/src/lib/krb5/krb/copy_princ.c @@ -24,10 +24,7 @@ * krb5_copy_principal() */ - -#include <krb5/krb5.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" /* * Copy a principal structure, with fresh allocation. diff --git a/src/lib/krb5/krb/copy_tick.c b/src/lib/krb5/krb/copy_tick.c index 7ee83f0..b1e05e8 100644 --- a/src/lib/krb5/krb/copy_tick.c +++ b/src/lib/krb5/krb/copy_tick.c @@ -24,10 +24,7 @@ * krb5_copy_ticket() */ - -#include <krb5/krb5.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" static krb5_error_code krb5_copy_enc_tkt_part(context, partfrom, partto) diff --git a/src/lib/krb5/krb/cp_key_cnt.c b/src/lib/krb5/krb/cp_key_cnt.c index 541562b..b4afc2e 100644 --- a/src/lib/krb5/krb/cp_key_cnt.c +++ b/src/lib/krb5/krb/cp_key_cnt.c @@ -24,9 +24,7 @@ * krb5_copy_keyblock() */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" /* * Copy a keyblock, including alloc'ed storage. diff --git a/src/lib/krb5/krb/decode_kdc.c b/src/lib/krb5/krb/decode_kdc.c index a611ea3..007b2ab 100644 --- a/src/lib/krb5/krb/decode_kdc.c +++ b/src/lib/krb5/krb/decode_kdc.c @@ -24,12 +24,7 @@ * krb5_decode_kdc_rep() function. */ - - -#include <krb5/krb5.h> -#include <krb5/asn1.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" /* Takes a KDC_REP message and decrypts encrypted part using etype and diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c index 9a31a0b..3307124 100644 --- a/src/lib/krb5/krb/decrypt_tk.c +++ b/src/lib/krb5/krb/decrypt_tk.c @@ -24,12 +24,7 @@ * krb5_decrypt_tkt_part() function. */ - - -#include <krb5/krb5.h> -#include <krb5/asn1.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" /* Decrypts dec_ticket->enc_part diff --git a/src/lib/krb5/krb/encode_kdc.c b/src/lib/krb5/krb/encode_kdc.c index 6550cb4..5b72dc4 100644 --- a/src/lib/krb5/krb/encode_kdc.c +++ b/src/lib/krb5/krb/encode_kdc.c @@ -24,10 +24,7 @@ * krb5_encode_kdc_rep() function. */ -#include <krb5/krb5.h> -#include <krb5/asn1.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" /* Takes KDC rep parts in *rep and *encpart, and formats it into *enc_rep, diff --git a/src/lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c index a363cac..65cbd74 100644 --- a/src/lib/krb5/krb/encrypt_tk.c +++ b/src/lib/krb5/krb/encrypt_tk.c @@ -24,12 +24,7 @@ * krb5_encrypt_tkt_part() routine. */ - - -#include <krb5/krb5.h> -#include <krb5/asn1.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" /* Takes unencrypted dec_ticket & dec_tkt_part, encrypts with diff --git a/src/lib/krb5/krb/faddr_ordr.c b/src/lib/krb5/krb/faddr_ordr.c index f0f1093..1afb65a 100644 --- a/src/lib/krb5/krb/faddr_ordr.c +++ b/src/lib/krb5/krb/faddr_ordr.c @@ -24,9 +24,7 @@ * krb5_fulladdr_order() */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" #ifndef min #define min(a,b) ((a) > (b) ? (a) : (b)) diff --git a/src/lib/krb5/krb/free_rtree.c b/src/lib/krb5/krb/free_rtree.c index 7206bc3..b3b70e4 100644 --- a/src/lib/krb5/krb/free_rtree.c +++ b/src/lib/krb5/krb/free_rtree.c @@ -24,9 +24,7 @@ * krb5_free_realm_tree() */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" void INTERFACE krb5_free_realm_tree(context, realms) diff --git a/src/lib/krb5/krb/gc_2tgt.c b/src/lib/krb5/krb/gc_2tgt.c index 88f493a..5689f1e 100644 --- a/src/lib/krb5/krb/gc_2tgt.c +++ b/src/lib/krb5/krb/gc_2tgt.c @@ -24,11 +24,7 @@ * Given two tgts, get a ticket. */ -#include <krb5/krb5.h> -#include <krb5/asn1.h> /* needed for some macros */ - -#include <krb5/los-proto.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" #include "int-proto.h" krb5_error_code INTERFACE diff --git a/src/lib/krb5/krb/gc_frm_kdc.c b/src/lib/krb5/krb/gc_frm_kdc.c index 72a4578..daf14ca 100644 --- a/src/lib/krb5/krb/gc_frm_kdc.c +++ b/src/lib/krb5/krb/gc_frm_kdc.c @@ -27,10 +27,8 @@ * along the way. */ - #include <stdio.h> -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" #include "int-proto.h" /* diff --git a/src/lib/krb5/krb/gc_via_tgt.c b/src/lib/krb5/krb/gc_via_tgt.c index 11d4dfa..de9dae5 100644 --- a/src/lib/krb5/krb/gc_via_tgt.c +++ b/src/lib/krb5/krb/gc_via_tgt.c @@ -24,13 +24,7 @@ * Given a tgt, and a target cred, get it. */ - -#include <krb5/krb5.h> - -#include <krb5/asn1.h> - -#include <krb5/los-proto.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" #include "int-proto.h" krb5_error_code INTERFACE diff --git a/src/lib/krb5/krb/gen_seqnum.c b/src/lib/krb5/krb/gen_seqnum.c index c8d702b..4befc40 100644 --- a/src/lib/krb5/krb/gen_seqnum.c +++ b/src/lib/krb5/krb/gen_seqnum.c @@ -26,10 +26,7 @@ * then taking the output and slicing it up. */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> -#include <krb5/los-proto.h> +#include "k5-int.h" #ifndef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) diff --git a/src/lib/krb5/krb/gen_subkey.c b/src/lib/krb5/krb/gen_subkey.c index 763c909..a326f2f 100644 --- a/src/lib/krb5/krb/gen_subkey.c +++ b/src/lib/krb5/krb/gen_subkey.c @@ -24,9 +24,7 @@ * Routine to automatically generate a subsession key based on an input key. */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" krb5_error_code INTERFACE krb5_generate_subkey(context, key, subkey) diff --git a/src/lib/krb5/krb/get_creds.c b/src/lib/krb5/krb/get_creds.c index a6c08fe..bc9360a 100644 --- a/src/lib/krb5/krb/get_creds.c +++ b/src/lib/krb5/krb/get_creds.c @@ -40,8 +40,7 @@ returns errors from encryption routines, system errors */ -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" krb5_error_code INTERFACE krb5_get_credentials(context, options, ccache, in_creds, out_creds) diff --git a/src/lib/krb5/krb/get_fcreds.c b/src/lib/krb5/krb/get_fcreds.c index 3a88e77..08f138f 100644 --- a/src/lib/krb5/krb/get_fcreds.c +++ b/src/lib/krb5/krb/get_fcreds.c @@ -35,10 +35,7 @@ #include <pwd.h> #include <netdb.h> -#include <krb5/krb5.h> -#include <krb5/asn1.h> -#include <krb5/los-proto.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" #define KRB5_DEFAULT_LIFE 60*60*8 /* 8 hours */ /* helper function: convert flags to necessary KDC options */ diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 6b47622..7acbb94 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -24,11 +24,7 @@ * krb5_get_in_tkt() */ - -#include <krb5/krb5.h> -#include <krb5/asn1.h> -#include <krb5/los-proto.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" /* All-purpose initial ticket routine, usually called via diff --git a/src/lib/krb5/krb/in_tkt_ktb.c b/src/lib/krb5/krb/in_tkt_ktb.c index 20df47c..7b0858e 100644 --- a/src/lib/krb5/krb/in_tkt_ktb.c +++ b/src/lib/krb5/krb/in_tkt_ktb.c @@ -25,8 +25,7 @@ * */ -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" struct keytab_keyproc_arg { krb5_keytab keytab; diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c index 02ea384..76fa121 100644 --- a/src/lib/krb5/krb/in_tkt_pwd.c +++ b/src/lib/krb5/krb/in_tkt_pwd.c @@ -24,10 +24,7 @@ * krb5_get_in_tkt_with_password() */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> -#include <krb5/los-proto.h> +#include "k5-int.h" extern char *krb5_default_pwd_prompt1; diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c index 54c4a2b..2788950 100644 --- a/src/lib/krb5/krb/in_tkt_sky.c +++ b/src/lib/krb5/krb/in_tkt_sky.c @@ -25,10 +25,7 @@ * */ - -#include <krb5/krb5.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" struct skey_keyproc_arg { const krb5_keyblock *key; diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index 50c6dac..199d8ef 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -23,9 +23,7 @@ * krb5_init_contex() */ -#include <krb5/krb5.h> -#include <krb5/los-proto.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" krb5_error_code INTERFACE krb5_init_context(context) diff --git a/src/lib/krb5/krb/kdc_rep_dc.c b/src/lib/krb5/krb/kdc_rep_dc.c index f8cdc68..c2cdf12 100644 --- a/src/lib/krb5/krb/kdc_rep_dc.c +++ b/src/lib/krb5/krb/kdc_rep_dc.c @@ -24,10 +24,7 @@ * krb5_kdc_rep_decrypt_proc() */ - -#include <krb5/krb5.h> -#include <krb5/asn1.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" /* * Decrypt the encrypted portion of the KDC_REP message, using the key diff --git a/src/lib/krb5/krb/krbconfig.c b/src/lib/krb5/krb/krbconfig.c index c6619b9..f0ae06d 100644 --- a/src/lib/krb5/krb/krbconfig.c +++ b/src/lib/krb5/krb/krbconfig.c @@ -24,8 +24,7 @@ * Configuration variables for libkrb. */ - -#include <krb5/krb5.h> +#include "k5-int.h" krb5_deltat krb5_clockskew = 5 * 60; /* five minutes */ krb5_cksumtype krb5_kdc_req_sumtype = CKSUMTYPE_RSA_MD4; diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c index 668c91f..b432680 100644 --- a/src/lib/krb5/krb/mk_cred.c +++ b/src/lib/krb5/krb/mk_cred.c @@ -28,10 +28,7 @@ /* XXX Once we finalize the API, it should go into func-proto.h and */ /* into the API doc. */ -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> -#include <krb5/los-proto.h> -#include <krb5/asn1.h> +#include "k5-int.h" /* Create asn.1 encoded KRB-CRED message from the kdc reply. */ krb5_error_code INTERFACE diff --git a/src/lib/krb5/krb/mk_error.c b/src/lib/krb5/krb/mk_error.c index 0d924aa..4f05e75 100644 --- a/src/lib/krb5/krb/mk_error.c +++ b/src/lib/krb5/krb/mk_error.c @@ -24,11 +24,7 @@ * krb5_mk_error() routine. */ - -#include <krb5/krb5.h> -#include <krb5/asn1.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" /* formats the error structure *dec_err into an error buffer *enc_err. diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c index 39832bb..c09a467 100644 --- a/src/lib/krb5/krb/mk_priv.c +++ b/src/lib/krb5/krb/mk_priv.c @@ -24,11 +24,7 @@ * krb5_mk_priv() */ - -#include <krb5/krb5.h> -#include <krb5/asn1.h> -#include <krb5/los-proto.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" /* Formats a KRB_PRIV message into outbuf. diff --git a/src/lib/krb5/krb/mk_rep.c b/src/lib/krb5/krb/mk_rep.c index d76e042..27543ca 100644 --- a/src/lib/krb5/krb/mk_rep.c +++ b/src/lib/krb5/krb/mk_rep.c @@ -24,14 +24,7 @@ * krb5_mk_rep() */ - -#include <krb5/krb5.h> -#include <krb5/asn1.h> - -#include <krb5/libos.h> -#include <krb5/los-proto.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" /* Formats a KRB_AP_REP message into outbuf. diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c index 2bb89bc..91a769e 100644 --- a/src/lib/krb5/krb/mk_req.c +++ b/src/lib/krb5/krb/mk_req.c @@ -24,10 +24,7 @@ * krb5_mk_req() routine. */ - -#include <krb5/krb5.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" /* Formats a KRB_AP_REQ message into outbuf. diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c index 1f8c98e..38c287c 100644 --- a/src/lib/krb5/krb/mk_req_ext.c +++ b/src/lib/krb5/krb/mk_req_ext.c @@ -24,14 +24,7 @@ * krb5_mk_req_extended() */ - -#include <krb5/krb5.h> -#include <krb5/asn1.h> - -#include <krb5/libos.h> -#include <krb5/los-proto.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" /* Formats a KRB_AP_REQ message into outbuf, with more complete options than diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c index b5b691b..2832dd8 100644 --- a/src/lib/krb5/krb/mk_safe.c +++ b/src/lib/krb5/krb/mk_safe.c @@ -24,11 +24,7 @@ * krb5_mk_safe() */ - -#include <krb5/krb5.h> -#include <krb5/asn1.h> -#include <krb5/los-proto.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" /* Formats a KRB_SAFE message into outbuf. diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c index 60aea42..f403a31 100644 --- a/src/lib/krb5/krb/parse.c +++ b/src/lib/krb5/krb/parse.c @@ -27,11 +27,7 @@ * characters in the principal name. */ - - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> -#include <krb5/los-proto.h> +#include "k5-int.h" /* * converts a single-string representation of the name to the @@ -190,10 +186,10 @@ krb5_parse_name(context, name, nprincipal) else krb5_princ_component(context, principal, i)->length = size; if (i + 1 != components) { - #ifndef _WINDOWS +#ifndef _WINDOWS fprintf(stderr, "Programming error in krb5_parse_name!"); - #endif +#endif exit(1); } } else { diff --git a/src/lib/krb5/krb/pr_to_salt.c b/src/lib/krb5/krb/pr_to_salt.c index 2f7beb8..5c7c794 100644 --- a/src/lib/krb5/krb/pr_to_salt.c +++ b/src/lib/krb5/krb/pr_to_salt.c @@ -24,10 +24,7 @@ * krb5_principal2salt() */ - - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" /* * Convert a krb5_principal into the default salt for that principal. diff --git a/src/lib/krb5/krb/preauth.c b/src/lib/krb5/krb/preauth.c index e4992a4..f9c939b 100644 --- a/src/lib/krb5/krb/preauth.c +++ b/src/lib/krb5/krb/preauth.c @@ -39,11 +39,7 @@ #include <stdio.h> #include <time.h> -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> -#include <krb5/preauth.h> -#include <krb5/mit-des.h> - +#include "k5-int.h" #include <syslog.h> static krb5_preauth_ops preauth_systems[] = { diff --git a/src/lib/krb5/krb/princ_comp.c b/src/lib/krb5/krb/princ_comp.c index 7000ed8..12a1df2 100644 --- a/src/lib/krb5/krb/princ_comp.c +++ b/src/lib/krb5/krb/princ_comp.c @@ -25,9 +25,7 @@ * not. */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" krb5_boolean INTERFACE krb5_realm_compare(context, princ1, princ2) diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c index 1316be8..d82868b 100644 --- a/src/lib/krb5/krb/rd_cred.c +++ b/src/lib/krb5/krb/rd_cred.c @@ -27,10 +27,7 @@ /* XXX Once we finalize the API, it should go into func-proto.h and */ /* into the API doc. */ -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> -#include <krb5/los-proto.h> -#include <krb5/asn1.h> +#include "k5-int.h" extern krb5_deltat krb5_clockskew; #define in_clock_skew(date) (labs((date)-currenttime) < krb5_clockskew) diff --git a/src/lib/krb5/krb/rd_error.c b/src/lib/krb5/krb/rd_error.c index 29a3723..0b2d147 100644 --- a/src/lib/krb5/krb/rd_error.c +++ b/src/lib/krb5/krb/rd_error.c @@ -24,12 +24,7 @@ * krb5_rd_error() routine */ - - -#include <krb5/krb5.h> -#include <krb5/asn1.h> - -#include <krb5/ext-proto.h> +#include "k5-int.h" /* * Parses an error message from enc_errbuf and returns an allocated diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c index 199d46d..f00440f 100644 --- a/src/lib/krb5/krb/rd_priv.c +++ b/src/lib/krb5/krb/rd_priv.c @@ -24,12 +24,7 @@ * krb5_rd_priv() */ - -#include <krb5/krb5.h> - -#include <krb5/asn1.h> -#include <krb5/los-proto.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" extern krb5_deltat krb5_clockskew; #define in_clock_skew(date) (labs((date)-currenttime) < krb5_clockskew) diff --git a/src/lib/krb5/krb/rd_rep.c b/src/lib/krb5/krb/rd_rep.c index 779fbad..e933b1d 100644 --- a/src/lib/krb5/krb/rd_rep.c +++ b/src/lib/krb5/krb/rd_rep.c @@ -24,11 +24,7 @@ * krb5_rd_rep() */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> -#include <krb5/los-proto.h> -#include <krb5/asn1.h> +#include "k5-int.h" /* * Parses a KRB_AP_REP message, returning its contents. diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c index 97e5a38..6a6875a 100644 --- a/src/lib/krb5/krb/rd_req.c +++ b/src/lib/krb5/krb/rd_req.c @@ -24,11 +24,7 @@ * krb5_rd_req() */ - -#include <krb5/krb5.h> - -#include <krb5/asn1.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" /* * Parses a KRB_AP_REQ message, returning its contents. diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c index 1963126..c2ec290 100644 --- a/src/lib/krb5/krb/rd_req_dec.c +++ b/src/lib/krb5/krb/rd_req_dec.c @@ -26,11 +26,7 @@ * krb5_rd_req_decoded() */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> -#include <krb5/los-proto.h> -#include <krb5/asn1.h> +#include "k5-int.h" /* * essentially the same as krb_rd_req, but uses a decoded AP_REQ as diff --git a/src/lib/krb5/krb/rd_req_sim.c b/src/lib/krb5/krb/rd_req_sim.c index f2db248..15bce82 100644 --- a/src/lib/krb5/krb/rd_req_sim.c +++ b/src/lib/krb5/krb/rd_req_sim.c @@ -24,10 +24,7 @@ * krb5_rd_req_simple() */ - -#include <krb5/krb5.h> -#include <krb5/asn1.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" /* * Parses a KRB_AP_REQ message, returning its contents. diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c index 2bdcdf4..68c264b 100644 --- a/src/lib/krb5/krb/rd_safe.c +++ b/src/lib/krb5/krb/rd_safe.c @@ -24,11 +24,7 @@ * krb5_rd_safe() */ - -#include <krb5/krb5.h> -#include <krb5/asn1.h> -#include <krb5/los-proto.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" extern krb5_deltat krb5_clockskew; #define in_clock_skew(date) (labs((date)-currenttime) < krb5_clockskew) diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c index 2cd87c9..4d1c950 100644 --- a/src/lib/krb5/krb/recvauth.c +++ b/src/lib/krb5/krb/recvauth.c @@ -25,14 +25,9 @@ */ -#include <krb5/krb5.h> +#include "k5-int.h" #ifndef _MSDOS -#include <krb5/osconf.h> -#include <krb5/kdb.h> -#include <krb5/kdb_dbm.h> -#include <krb5/ext-proto.h> -#include <krb5/los-proto.h> -#include <com_err.h> +#include "com_err.h" #include <errno.h> #include <stdio.h> diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c index 8b2d8d4..d20e497 100644 --- a/src/lib/krb5/krb/send_tgs.c +++ b/src/lib/krb5/krb/send_tgs.c @@ -24,11 +24,8 @@ * krb5_send_tgs() */ +#include "k5-int.h" -#include <krb5/krb5.h> -#include <krb5/asn1.h> -#include <krb5/los-proto.h> -#include <krb5/ext-proto.h> /* Sends a request to the TGS and waits for a response. options is used for the options in the KRB_TGS_REQ. diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c index 2f67f30..9c18ed8 100644 --- a/src/lib/krb5/krb/sendauth.c +++ b/src/lib/krb5/krb/sendauth.c @@ -24,16 +24,9 @@ * convenience sendauth/recvauth functions */ - -#include <krb5/krb5.h> -#include <krb5/osconf.h> -#include <krb5/kdb.h> -#include <krb5/kdb_dbm.h> -#include <krb5/ext-proto.h> -#include <krb5/los-proto.h> -#include <com_err.h> +#include "k5-int.h" +#include "com_err.h" #include <errno.h> - #include <stdio.h> #include <string.h> #ifdef _MSDOS diff --git a/src/lib/krb5/krb/srv_rcache.c b/src/lib/krb5/krb/srv_rcache.c index 39bb229..5675870 100644 --- a/src/lib/krb5/krb/srv_rcache.c +++ b/src/lib/krb5/krb/srv_rcache.c @@ -24,9 +24,7 @@ * Allocate & prepare a default replay cache for a server. */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" #include <ctype.h> #include <stdio.h> diff --git a/src/lib/krb5/krb/t_walk_rtree.c b/src/lib/krb5/krb/t_walk_rtree.c index e1ced30..419c413 100644 --- a/src/lib/krb5/krb/t_walk_rtree.c +++ b/src/lib/krb5/krb/t_walk_rtree.c @@ -3,9 +3,8 @@ */ #include <stdio.h> -#include <com_err.h> - -#include <krb5/krb5.h> +#include "com_err.h" +#include "k5-int.h" main(argc, argv) int argc; diff --git a/src/lib/krb5/krb/tgtname.c b/src/lib/krb5/krb/tgtname.c index e6cf43c..98e17b4 100644 --- a/src/lib/krb5/krb/tgtname.c +++ b/src/lib/krb5/krb/tgtname.c @@ -24,9 +24,7 @@ * krb5_tgtname() */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" /* This is an internal-only function, used by krb5_get_cred_from_kdc() */ diff --git a/src/lib/krb5/krb/unparse.c b/src/lib/krb5/krb/unparse.c index f817450..cf3b82d 100644 --- a/src/lib/krb5/krb/unparse.c +++ b/src/lib/krb5/krb/unparse.c @@ -30,8 +30,7 @@ #include <stdio.h> -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" /* * converts the multi-part principal format used in the protocols to a diff --git a/src/lib/krb5/krb/walk_rtree.c b/src/lib/krb5/krb/walk_rtree.c index 38fa355..e083738 100644 --- a/src/lib/krb5/krb/walk_rtree.c +++ b/src/lib/krb5/krb/walk_rtree.c @@ -24,9 +24,7 @@ * krb5_walk_realm_tree() */ - -#include <krb5/krb5.h> -#include <krb5/ext-proto.h> +#include "k5-int.h" #include "int-proto.h" /* internal function, used by krb5_get_cred_from_kdc() */ |