* *.c: Avoid <krb5/...> 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 a6c9e65a7dc9b346ffa5b0c06d4f78ae99a3cc95..7e3e5d6d26b448877985f46f8023e531085d7955 100644 (file)
--- 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 76d8e91baf53f08bbc71fb2c1080ab7474818da1..f63ea0205e9ea629e8ef0e9263da2c1219e7ebb8 100644 (file)
--- 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 185f73f5193e66984ee8c06f962806d5246309da..c872c52c68612cba0a324d3997104a62a8d111bd 100644 (file)
--- 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 1988d08c19bab516660e91d289d5fed4e5bc1ca7..2e112ea8c49a6235ec0e9623fc5a68bbeb8ebd1b 100644 (file)
--- 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 753bbb7c7d02865f4ce89c46bfceeecc9858d6fc..1eb4f8bc8806ba3d0c42eab84424b342d42786a9 100644 (file)
--- 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 b82c43a037346a01fd1aef830139cd04f7e82964..6d1048e7bade3c18ce432924f1e37f5a8f955d40 100644 (file)
--- 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 b3264318f3034b2a06f1f007f9112f3f5cb40941..e7627ff45c48da5aae8bebff9e547be027e46533 100644 (file)
--- 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 9e986c002563a812c06816a57b0f8601dd6712a9..0a65e307cb6ec882e70d5c8b88b184de4f8672f7 100644 (file)
--- 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 001308041955e2ab740044aa297b5c15ca5fe0e1..770df77d2cad3c8a70da002c998c782bcd91141f 100644 (file)
--- 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 ad21082b39fbe55f6ce1236e085284d27b6c656f..29c97cecd01356c5d69e3368bda16d017b5548d3 100644 (file)
--- 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 c303af5c8bccf149a35f96569cdf81407ec0c6dd..826db0e6f7983cfffa16f0ae1a8ade45efac9107 100644 (file)
--- 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 62b0b610e0afa1054f57d3cdcf933631b8bd5929..993d084171aceadde7adecc2acb71a77ee6297af 100644 (file)
--- 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 0e1a25082ccd7c4af4c111c46fe7b0830be810bd..c7ebb8cb7fa57d926c9de31925c579cd477721f2 100644 (file)
--- 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 7ac47cc98b64fe8216f3206fed2a4d148dbf4193..264ca5143e14f99bfc9cfd645589a4ef4b90dc35 100644 (file)
--- 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 97010673d244c02a5719e0a5c15e30fa4c12eec5..fedf2dca71a68caaab3ca7e9e29b6511c6fd32fa 100644 (file)
--- 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 f714d86d86e81aad5870c0905120e823d0b31b8d..6e367d4de50fbe54a87bb7777db0f9c03293aa46 100644 (file)
--- 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 11dee84f4e39d3c7af6583b9dbb03c70dbf1ab09..48775e20b179bf008c04bb1e79c5bd7bb3e02558 100644 (file)
--- 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 7ee83f08a55cbec2deec278b829ad50826d57361..b1e05e83da7d4ef0c1b0602892199819a1b3f845 100644 (file)
--- 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 541562bd83368cafa7ba8373d135f818e2fed1bd..b4afc2ea1cd3d8094c4b1b307c88c107284137a0 100644 (file)
--- 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 a611ea378bedc0b5a7692b9ed045bb1c4e4db52b..007b2ab155cbedd0f01db2eacc53c87f0e632fab 100644 (file)
--- 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 9a31a0b00139c7f6627d0dcadbba71483e31a47d..330712466ea1d779cdcc46b7626788ebe3a3857b 100644 (file)
--- 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 6550cb4cab45c6da51ca5109ba0ecd85568945b9..5b72dc4f10ae6ed06df9ae47d3b021fb02427bc3 100644 (file)
--- 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 a363cac48406a74ae063d4db038a912d7b243c20..65cbd744d1dfac197f7e279324320fe0253655d9 100644 (file)
--- 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 f0f10938112da45075be93ba2cb89b4680d2cfa6..1afb65af53c11e27a00890a3288a98e67c155a28 100644 (file)
--- 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 7206bc3149fd648f2f4fc219b975dbca54671a44..b3b70e4807f429786d7f1f6d30e938130372d52e 100644 (file)
--- 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 88f493a9f70560dc44744cf1e7dbff2362d59a21..5689f1eaf2e1c7b4efb3255cd7b3209037a8334a 100644 (file)
--- 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 72a4578431387d092ffe7eb04b5a5e09eafeda4e..daf14caf49c3412ba34fde9ff18e5920cd346a0f 100644 (file)
--- 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 11d4dfa543246c4d9586db084cc1f9a36ecdba11..de9dae52b20ddcb8f5f1d846fe7eeb50b0855616 100644 (file)
--- 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 c8d702bc58aca2733d64cdb905012a88482fda76..4befc40af235515353e8e98721df6236df52f7ca 100644 (file)
--- 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 763c909a56c00d18fdefef8ab100fe3cf5c19306..a326f2f43ed61492bc7b99df3d691fb6d93a91c1 100644 (file)
--- 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 a6c08fe533f68d752e21523a4bf11fa89d6d6b72..bc9360a9370328dc305691deb6d9ee503e220650 100644 (file)
--- 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 3a88e77c98e8b26fb9c282c5788eea35fe0908c6..08f138fb8b47d9910ea283606b0d9b665f73251c 100644 (file)
--- 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 6b4762253daf1ebf2a40958014de4d10678a1609..7acbb9473020786ef6542094de398a3aea47e92b 100644 (file)
--- 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 20df47c194809340d222bee90e9a01c1daa7392c..7b0858e444f58e852b705f629743807140ea818d 100644 (file)
--- 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 02ea384d9ba49ff179a35602ca7f14f59dd348e4..76fa1210dfa25e36c8650961e52734d36a71eeb6 100644 (file)
--- 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 54c4a2b90ba5019b7efbb9a45e55c874e12700f6..2788950711081155cd2213f086554f60a87a103a 100644 (file)
--- 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 50c6dacd6446bc4528e17d74b0d057663275a22c..199d8ef294e854f0be86315944ed3e890bc697a7 100644 (file)
--- 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 f8cdc687738bbd1ec4892294e354a8f4073ae0b5..c2cdf12281228db1431a7458710c7851e7fc9c5b 100644 (file)
--- 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 c6619b9935be0e12b88007e082990929fcb726ce..f0ae06d5caa11cb387ab1af043d4ac2c39ccefa2 100644 (file)
--- 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 668c91f8d712b533f9fcfec5819e29b873afaaa3..b43268056caf73042f78999af9c32cf3082140b0 100644 (file)
--- 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 0d924aaa99298ec360da0696947879f2512374f5..4f05e75ddbaedfbed48b0c92621ecf6317e8581d 100644 (file)
--- 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 39832bb2c3669b2dd4abdf09f70d73fccc0510f0..c09a467de3e93a191f91d9701b23f360bb71b853 100644 (file)
--- 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 d76e042a448a228144d0b81498673a6b32ffc6e1..27543cac2ea0df583387b70e37671219c600d681 100644 (file)
--- 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 2bb89bc69f659f36b13652bae0c6d54bb4eed7c1..91a769e9314d88ac8c9f7ccafef21501be81d8b2 100644 (file)
--- 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 1f8c98eb66b02de42fe6279c16caae1102fbf16a..38c287c19d3729d8a9741f7c7569632ae71173d0 100644 (file)
--- 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 b5b691b98ea84b68e174457f7508faa2d73cd30b..2832dd882160a2116d0d5e1517c65fb8b6ad4903 100644 (file)
--- 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 60aea42e5838c12bc1111f8375f89c0763b9667b..f403a31174eca792331f740ef9580c3e0ef451e1 100644 (file)
--- 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 2f7beb8da7e74c2d883dfeaf39b4f30618402aba..5c7c794a1edc15cde12f2c6d515e0cf292400286 100644 (file)
--- 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 e4992a4ba08d0deff0b5a922d6be9df30a2b2f1c..f9c939b1ce09e4fa6abe251fb91c18168c6faabb 100644 (file)
--- 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 7000ed8f1754668264f3f4d2a57955f3871f5a2f..12a1df20f780c866e70200178ba6d53b5fc04fc3 100644 (file)
--- 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 1316be8096663734755174b24a942d0e067897be..d82868bb1d5a7f275f349a1495d25b72dddef365 100644 (file)
--- 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 29a3723707513a563c405d9826a335d591c8ad55..0b2d147f4f8b71836f3a21322873de0537814202 100644 (file)
--- 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 199d46d9e00e91de49eccd58e7f8f7f63fa9a0d7..f00440f9db80c13c0daf3a25e76ebbfdf52c1c4a 100644 (file)
--- 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 779fbad949ea3a810a8f0938de699463843dc97b..e933b1dfc5810d24b8babac1252ae49930cf39ea 100644 (file)
--- 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 97e5a38398c11de199400ae443b390ff4706bf87..6a6875ab18767b864688a4e7861f8705b6ab46f6 100644 (file)
--- 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 19631268cc4d5182607f2e579015dddf8a146811..c2ec2904f0e1188b200fee17c6aed3be0186947a 100644 (file)
--- 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 f2db248f93fea9bc8aea58394f0e4b973c586966..15bce82e334733912177a44d403a80799111271e 100644 (file)
--- 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 2bdcdf4d166e920b6a016bc83a55d6058417a76f..68c264bc8e5e7dc26766d1f14cd4d5740e045aa2 100644 (file)
--- 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 2cd87c9cada1a7b50869e686e5fba54da89d80cf..4d1c95041f90396bf5fd2f2d2257de91e1d726ab 100644 (file)
--- 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 8b2d8d47a872210592865d3fcf17ab7ff03b7409..d20e4970b0c8d1ad2e2200f81ddd42cb40703175 100644 (file)
--- 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 2f67f30d26117b9c1af5ed5ae5f6615a1f36ddd2..9c18ed8b5e80fae57d1ee1ece9283e03df7cd8f1 100644 (file)
--- 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 39bb229ae2125a59cf68ef5b0d6d58f66bb5efe2..56758706abd3044a936a66d47129ae115f53ce43 100644 (file)
--- 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 e1ced303c56dea45a5dabd0f0112d7a8e269ba29..419c4137e8f85676c2e797aa24726602b0f5ae6f 100644 (file)
--- 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 e6cf43c889ce0b19655a6d8c508ba668618dbe29..98e17b4e0ba85a7ed003623a7837d029e3fb336c 100644 (file)
--- 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 f8174503580547765c1ecdbf7aa90bcdc2f3f518..cf3b82dbbc9d23f71995b4ee20a2861a9b54ac0c 100644 (file)
--- 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 38fa355250220359e8f70d79cf284706d4514b8c..e083738045676c40a9646f35faef17ee89a0d15f 100644 (file)
--- 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() */