From: John Gilmore Date: Tue, 28 Feb 1995 09:21:46 +0000 (+0000) Subject: * *.c: Avoid includes. X-Git-Tag: krb5-1.0-beta5~655 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ef90d8fb6d87241ab82560131c1268e50a2c9c7f;p=krb5.git * *.c: Avoid includes. * parse.c: Exdent #ifndef to left margin for old compilers. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5015 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index a6c9e65a7..7e3e5d6d2 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 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 76d8e91ba..f63ea0205 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 -#include +#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 185f73f51..c872c52c6 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 -#include +#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 1988d08c1..2e112ea8c 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 +#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 753bbb7c7..1eb4f8bc8 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 -#include +#include "k5-int.h" #if __STDC__ || defined(STDARG_PROTOTYPES) #include diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c index b82c43a03..6d1048e7b 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 for STDARG_PROTOTYPES */ -#include +#include "k5-int.h" #if __STDC__ || defined(STDARG_PROTOTYPES) #include @@ -34,8 +33,6 @@ #include #endif -#include - 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 b3264318f..e7627ff45 100644 --- a/src/lib/krb5/krb/chk_trans.c +++ b/src/lib/krb5/krb/chk_trans.c @@ -21,7 +21,7 @@ */ #include -#include +#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 9e986c002..0a65e307c 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 +#include "k5-int.h" #ifndef _MSDOS -#include -#include -#include -#include -#include #include -#include +#include "com_err.h" #include #include diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c index 001308041..770df77d2 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 +#include "k5-int.h" #include #include diff --git a/src/lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c index ad21082b3..29c97cecd 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 - -#include +#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 c303af5c8..826db0e6f 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 - -#include +#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 62b0b610e..993d08417 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 - -#include +#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 0e1a25082..c7ebb8cb7 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 - -#include +#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 7ac47cc98..264ca5143 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 -#include - +#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 97010673d..fedf2dca7 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 -#include +#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 f714d86d8..6e367d4de 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 -#include +#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 11dee84f4..48775e20b 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 - -#include +#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 7ee83f08a..b1e05e83d 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 - -#include +#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 541562bd8..b4afc2ea1 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 -#include +#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 a611ea378..007b2ab15 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 -#include - -#include +#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 9a31a0b00..330712466 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 -#include - -#include +#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 6550cb4ca..5b72dc4f1 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 -#include - -#include +#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 a363cac48..65cbd744d 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 -#include - -#include +#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 f0f109381..1afb65af5 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 -#include +#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 7206bc314..b3b70e480 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 -#include +#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 88f493a9f..5689f1eaf 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 -#include /* needed for some macros */ - -#include -#include +#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 72a457843..daf14caf4 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 -#include -#include +#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 11d4dfa54..de9dae52b 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 - -#include - -#include -#include +#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 c8d702bc5..4befc40af 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 -#include -#include +#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 763c909a5..a326f2f43 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 -#include +#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 a6c08fe53..bc9360a93 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 -#include +#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 3a88e77c9..08f138fb8 100644 --- a/src/lib/krb5/krb/get_fcreds.c +++ b/src/lib/krb5/krb/get_fcreds.c @@ -35,10 +35,7 @@ #include #include -#include -#include -#include -#include +#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 6b4762253..7acbb9473 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 -#include -#include -#include +#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 20df47c19..7b0858e44 100644 --- a/src/lib/krb5/krb/in_tkt_ktb.c +++ b/src/lib/krb5/krb/in_tkt_ktb.c @@ -25,8 +25,7 @@ * */ -#include -#include +#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 02ea384d9..76fa1210d 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 -#include -#include +#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 54c4a2b90..278895071 100644 --- a/src/lib/krb5/krb/in_tkt_sky.c +++ b/src/lib/krb5/krb/in_tkt_sky.c @@ -25,10 +25,7 @@ * */ - -#include - -#include +#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 50c6dacd6..199d8ef29 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 -#include -#include +#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 f8cdc6877..c2cdf1228 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 -#include -#include +#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 c6619b993..f0ae06d5c 100644 --- a/src/lib/krb5/krb/krbconfig.c +++ b/src/lib/krb5/krb/krbconfig.c @@ -24,8 +24,7 @@ * Configuration variables for libkrb. */ - -#include +#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 668c91f8d..b43268056 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 -#include -#include -#include +#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 0d924aaa9..4f05e75dd 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 -#include - -#include +#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 39832bb2c..c09a467de 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 -#include -#include -#include +#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 d76e042a4..27543cac2 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 -#include - -#include -#include - -#include +#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 2bb89bc69..91a769e93 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 - -#include +#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 1f8c98eb6..38c287c19 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 -#include - -#include -#include - -#include +#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 b5b691b98..2832dd882 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 -#include -#include -#include +#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 60aea42e5..f403a3117 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 -#include -#include +#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 2f7beb8da..5c7c794a1 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 -#include +#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 e4992a4ba..f9c939b1c 100644 --- a/src/lib/krb5/krb/preauth.c +++ b/src/lib/krb5/krb/preauth.c @@ -39,11 +39,7 @@ #include #include -#include -#include -#include -#include - +#include "k5-int.h" #include 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 7000ed8f1..12a1df20f 100644 --- a/src/lib/krb5/krb/princ_comp.c +++ b/src/lib/krb5/krb/princ_comp.c @@ -25,9 +25,7 @@ * not. */ - -#include -#include +#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 1316be809..d82868bb1 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 -#include -#include -#include +#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 29a372370..0b2d147f4 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 -#include - -#include +#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 199d46d9e..f00440f9d 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 - -#include -#include -#include +#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 779fbad94..e933b1dfc 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 -#include -#include -#include +#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 97e5a3839..6a6875ab1 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 - -#include -#include +#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 19631268c..c2ec2904f 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 -#include -#include -#include +#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 f2db248f9..15bce82e3 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 -#include -#include +#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 2bdcdf4d1..68c264bc8 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 -#include -#include -#include +#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 2cd87c9ca..4d1c95041 100644 --- a/src/lib/krb5/krb/recvauth.c +++ b/src/lib/krb5/krb/recvauth.c @@ -25,14 +25,9 @@ */ -#include +#include "k5-int.h" #ifndef _MSDOS -#include -#include -#include -#include -#include -#include +#include "com_err.h" #include #include diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c index 8b2d8d47a..d20e4970b 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 -#include -#include -#include /* 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 2f67f30d2..9c18ed8b5 100644 --- a/src/lib/krb5/krb/sendauth.c +++ b/src/lib/krb5/krb/sendauth.c @@ -24,16 +24,9 @@ * convenience sendauth/recvauth functions */ - -#include -#include -#include -#include -#include -#include -#include +#include "k5-int.h" +#include "com_err.h" #include - #include #include #ifdef _MSDOS diff --git a/src/lib/krb5/krb/srv_rcache.c b/src/lib/krb5/krb/srv_rcache.c index 39bb229ae..56758706a 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 -#include +#include "k5-int.h" #include #include diff --git a/src/lib/krb5/krb/t_walk_rtree.c b/src/lib/krb5/krb/t_walk_rtree.c index e1ced303c..419c4137e 100644 --- a/src/lib/krb5/krb/t_walk_rtree.c +++ b/src/lib/krb5/krb/t_walk_rtree.c @@ -3,9 +3,8 @@ */ #include -#include - -#include +#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 e6cf43c88..98e17b4e0 100644 --- a/src/lib/krb5/krb/tgtname.c +++ b/src/lib/krb5/krb/tgtname.c @@ -24,9 +24,7 @@ * krb5_tgtname() */ - -#include -#include +#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 f81745035..cf3b82dbb 100644 --- a/src/lib/krb5/krb/unparse.c +++ b/src/lib/krb5/krb/unparse.c @@ -30,8 +30,7 @@ #include -#include -#include +#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 38fa35525..e08373804 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 -#include +#include "k5-int.h" #include "int-proto.h" /* internal function, used by krb5_get_cred_from_kdc() */