From fbdb946cfc00a2a8ee0e6f8205c5fe8a998963ab Mon Sep 17 00:00:00 2001 From: Chris Provenzano Date: Wed, 25 Jan 1995 22:29:07 +0000 Subject: [PATCH] * Removed all narrow types and references to wide.h and narrow.h git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4837 dc483132-0cff-0310-8789-dd5450dbe970 --- src/admin/edit/ChangeLog | 4 ++++ src/admin/edit/kdb5_edit.h | 3 --- src/appl/bsd/ChangeLog | 4 ++++ src/appl/bsd/krcp.c | 2 -- src/appl/user_user/ChangeLog | 4 ++++ src/appl/user_user/client.c | 2 -- src/kadmin/client/ChangeLog | 4 ++++ src/kadmin/client/kadmin_msnd.c | 3 --- src/kadmin/kpasswd/ChangeLog | 4 ++++ src/kadmin/kpasswd/kpasswd.c | 3 --- src/kadmin/server/ChangeLog | 4 ++++ src/kadmin/server/adm_funcs.c | 5 ----- src/kdc/ChangeLog | 4 ++++ src/kdc/kdc_util.c | 3 --- src/lib/crypto/des/ChangeLog | 4 ++++ src/lib/crypto/des/des_int.h | 7 ------- src/lib/gssapi/krb5/ChangeLog | 4 ++++ src/lib/gssapi/krb5/accept_sec_context.c | 2 -- src/lib/krb5/krb/ChangeLog | 4 ++++ src/lib/krb5/krb/get_in_tkt.c | 3 --- src/lib/krb5/krb/in_tkt_pwd.c | 2 -- src/lib/krb5/krb/in_tkt_sky.c | 3 --- src/lib/krb5/krb/int-proto.h | 4 ---- src/lib/krb5/krb/rd_req.c | 4 ---- src/lib/krb5/krb/rd_req_dec.c | 6 ------ src/tests/hammer/ChangeLog | 4 ++++ src/tests/hammer/kdc5_hammer.c | 4 +--- 27 files changed, 45 insertions(+), 55 deletions(-) diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog index ef46f3b2b..71f9ec230 100644 --- a/src/admin/edit/ChangeLog +++ b/src/admin/edit/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 25 16:54:40 1995 Chris Provenzano (proven@mit.edu) + + * Removed all narrow types and references to wide.h and narrow.h + Fri Jan 13 15:23:47 1995 Chris Provenzano (proven@mit.edu) * Added krb5_context to all krb5_routines diff --git a/src/admin/edit/kdb5_edit.h b/src/admin/edit/kdb5_edit.h index 180249a3f..64658932c 100644 --- a/src/admin/edit/kdb5_edit.h +++ b/src/admin/edit/kdb5_edit.h @@ -41,8 +41,6 @@ struct saltblock { krb5_data saltdata; }; -/* krb5_kvno may be narrow */ -#include void add_key PROTOTYPE((char const *, char const *, krb5_const_principal, const krb5_keyblock *, @@ -53,5 +51,4 @@ void enter_pwd_key int set_dbname_help PROTOTYPE((char *, char *)); -#include char *kdb5_edit_Init PROTOTYPE((int, char **)); diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index b7bbfe44c..e8059e3c0 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 25 16:54:40 1995 Chris Provenzano (proven@mit.edu) + + * Removed all narrow types and references to wide.h and narrow.h + Wed Jan 18 14:33:50 1995 Mark Eichin * krlogind.c (v4_des_read, v5_des_read): When reading length, diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c index d8bf15dcd..e8fe82c8b 100644 --- a/src/appl/bsd/krcp.c +++ b/src/appl/bsd/krcp.c @@ -1144,14 +1144,12 @@ char **save_argv(argc, argv) #define SIZEOF_INADDR sizeof(struct in_addr) #endif -#include krb5_error_code tgt_keyproc(context, keyprocarg, principal, vno, key) krb5_context context; krb5_pointer keyprocarg; krb5_principal principal; krb5_kvno vno; krb5_keyblock ** key; -#include { krb5_creds *creds = (krb5_creds *)keyprocarg; diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog index 8707c6a38..f9121180f 100644 --- a/src/appl/user_user/ChangeLog +++ b/src/appl/user_user/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 25 16:54:40 1995 Chris Provenzano (proven@mit.edu) + + * Removed all narrow types and references to wide.h and narrow.h + Fri Jan 13 15:23:47 1995 Chris Provenzano (proven@mit.edu) * Added krb5_context to all krb5_routines diff --git a/src/appl/user_user/client.c b/src/appl/user_user/client.c index be2aee27a..956e9c71c 100644 --- a/src/appl/user_user/client.c +++ b/src/appl/user_user/client.c @@ -37,7 +37,6 @@ #include #include -#include krb5_error_code tgt_keyproc(context, keyprocarg, principal, vno, key) krb5_context context; @@ -45,7 +44,6 @@ tgt_keyproc(context, keyprocarg, principal, vno, key) krb5_principal principal; krb5_kvno vno; krb5_keyblock ** key; -#include { krb5_creds *creds = (krb5_creds *)keyprocarg; diff --git a/src/kadmin/client/ChangeLog b/src/kadmin/client/ChangeLog index c3b2e6745..f3fcf908f 100644 --- a/src/kadmin/client/ChangeLog +++ b/src/kadmin/client/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 25 16:54:40 1995 Chris Provenzano (proven@mit.edu) + + * Removed all narrow types and references to wide.h and narrow.h + Fri Jan 13 15:23:47 1995 Chris Provenzano (proven@mit.edu) * Added krb5_context to all krb5_routines diff --git a/src/kadmin/client/kadmin_msnd.c b/src/kadmin/client/kadmin_msnd.c index c46ad69a5..adb3461e4 100644 --- a/src/kadmin/client/kadmin_msnd.c +++ b/src/kadmin/client/kadmin_msnd.c @@ -46,9 +46,6 @@ #include #include #include - -#include - #include #include #include diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog index 4dded80ee..9754a4b1e 100644 --- a/src/kadmin/kpasswd/ChangeLog +++ b/src/kadmin/kpasswd/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 25 16:54:40 1995 Chris Provenzano (proven@mit.edu) + + * Removed all narrow types and references to wide.h and narrow.h + Fri Jan 13 15:23:47 1995 Chris Provenzano (proven@mit.edu) * Added krb5_context to all krb5_routines diff --git a/src/kadmin/kpasswd/kpasswd.c b/src/kadmin/kpasswd/kpasswd.c index de57f442a..93fe82d8d 100644 --- a/src/kadmin/kpasswd/kpasswd.c +++ b/src/kadmin/kpasswd/kpasswd.c @@ -49,9 +49,6 @@ #include #include #include - -#include - #include #include #include diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog index 4e3c0abff..2f4fdefc3 100644 --- a/src/kadmin/server/ChangeLog +++ b/src/kadmin/server/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 25 16:54:40 1995 Chris Provenzano (proven@mit.edu) + + * Removed all narrow types and references to wide.h and narrow.h + Wed Jan 18 10:26:30 1995 * adm_server.c (process_args): Modify getopt args so that the 'M' diff --git a/src/kadmin/server/adm_funcs.c b/src/kadmin/server/adm_funcs.c index 1f8a3ff2a..6951954b0 100644 --- a/src/kadmin/server/adm_funcs.c +++ b/src/kadmin/server/adm_funcs.c @@ -62,9 +62,6 @@ extern krb5_keyblock master_keyblock; typedef unsigned char des_cblock[8]; - /* krb5_kvno may be narrow */ -#include - krb5_error_code adm_get_rnd_key PROTOTYPE((char *, krb5_ticket *, krb5_authenticator *, @@ -84,8 +81,6 @@ static krb5_error_code adm_modify_kdb struct saltblock *, krb5_db_entry *)); -#include - krb5_kvno adm_princ_exists(context, cmdname, principal, entry, nprincs) diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index f793d2226..8abd67adb 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 25 16:54:40 1995 Chris Provenzano (proven@mit.edu) + + * Removed all narrow types and references to wide.h and narrow.h + Fri Jan 13 15:23:47 1995 Chris Provenzano (proven@mit.edu) * Added krb5_context to all krb5_routines diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c index bc09ee96d..0ea5b8824 100644 --- a/src/kdc/kdc_util.c +++ b/src/kdc/kdc_util.c @@ -112,8 +112,6 @@ struct kparg { * krb5_rd_req_decoded, there's no reason to do it here, so we ignore the * "principal" argument. */ - -#include static krb5_error_code kdc_rdreq_keyproc(context, keyprocarg, principal, vno, key) krb5_context context; @@ -121,7 +119,6 @@ kdc_rdreq_keyproc(context, keyprocarg, principal, vno, key) krb5_principal principal; krb5_kvno vno; krb5_keyblock ** key; -#include { register struct kparg *whoisit = (struct kparg *)keyprocarg; char *sname; diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index fb9ebd6a9..431586bf5 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 25 16:54:40 1995 Chris Provenzano (proven@mit.edu) + + * Removed all narrow types and references to wide.h and narrow.h + Fri Nov 18 16:20:10 1994 Theodore Y. Ts'o (tytso@dcl) * destest.c (main): Add magic numbers to keyblock structure. diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h index cc5762a35..ac922ae19 100644 --- a/src/lib/crypto/des/des_int.h +++ b/src/lib/crypto/des/des_int.h @@ -103,10 +103,6 @@ typedef struct { } sbox_out; #endif /*BITS32*/ - -/* widen prototypes, if needed */ -#include - /* cbc_cksum.c */ extern krb5_error_code mit_des_cbc_checksum PROTOTYPE((krb5_pointer, size_t,krb5_pointer,size_t, krb5_checksum * )); @@ -194,7 +190,4 @@ extern unsigned long swap_long_bytes_bit_number PROTOTYPE((unsigned long )); extern void test_set PROTOTYPE((FILE *, const char *, int, const char *, int)); #endif -/* and back to normal... */ -#include - #endif /*DES_INTERNAL_DEFS*/ diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 91c2d9651..526effdb5 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 25 16:54:40 1995 Chris Provenzano (proven@mit.edu) + + * Removed all narrow types and references to wide.h and narrow.h + Sun Jan 22 18:26:32 1995 John Gilmore (gnu at toad.com) * acquire_cred.c (acquire_accept_cred): Add context arg when diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index c6e2dc47b..56dce2f12 100644 --- a/src/lib/gssapi/krb5/accept_sec_context.c +++ b/src/lib/gssapi/krb5/accept_sec_context.c @@ -24,7 +24,6 @@ #include #include -#include static krb5_error_code rd_req_keyproc(context, keyprocarg, server, kvno, keyblock) krb5_context context; @@ -32,7 +31,6 @@ rd_req_keyproc(context, keyprocarg, server, kvno, keyblock) krb5_principal server; krb5_kvno kvno; krb5_keyblock **keyblock; -#include { krb5_error_code code; krb5_keytab_entry ktentry; diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index ea7c50abe..6a4d7b6f7 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 25 16:54:40 1995 Chris Provenzano (proven@mit.edu) + + * Removed all narrow types and references to wide.h and narrow.h + Fri Jan 13 15:23:47 1995 Chris Provenzano (proven@mit.edu) * Added krb5_context to all krb5_routines diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 2cb128c8b..de17523ce 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -65,14 +65,11 @@ extern krb5_deltat krb5_clockskew; /* some typedef's for the function args to make things look a bit cleaner */ -/* widen this prototype if need be */ -#include typedef krb5_error_code (*git_key_proc) PROTOTYPE((krb5_context, const krb5_keytype, krb5_keyblock **, krb5_const_pointer, krb5_pa_data **)); -#include typedef krb5_error_code (*git_decrypt_proc) PROTOTYPE((krb5_context, const krb5_keyblock *, diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c index 2258f89ce..9bbb033e7 100644 --- a/src/lib/krb5/krb/in_tkt_pwd.c +++ b/src/lib/krb5/krb/in_tkt_pwd.c @@ -40,7 +40,6 @@ extern char *krb5_default_pwd_prompt1; * key-producing procedure for use by krb5_get_in_tkt_with_password. */ -#include static krb5_error_code pwd_keyproc(context, type, key, keyseed, padata) krb5_context context; @@ -48,7 +47,6 @@ pwd_keyproc(context, type, key, keyseed, padata) krb5_keyblock ** key; krb5_const_pointer keyseed; krb5_pa_data ** padata; -#include { krb5_data salt; krb5_error_code retval; diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c index 26b194723..cc9a89bc3 100644 --- a/src/lib/krb5/krb/in_tkt_sky.c +++ b/src/lib/krb5/krb/in_tkt_sky.c @@ -40,15 +40,12 @@ struct skey_keyproc_arg { * "keyseed" is actually a krb5_keyblock *, or NULL if we should fetch * from system area. */ -#include -static krb5_error_code skey_keyproc(context, type, key, keyseed, padata) krb5_context context; const krb5_keytype type; krb5_keyblock ** key; krb5_const_pointer keyseed; krb5_pa_data ** padata; -#include { krb5_keyblock *realkey; const struct skey_keyproc_arg *arg; diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h index 9a264a3df..84fd4ccf2 100644 --- a/src/lib/krb5/krb/int-proto.h +++ b/src/lib/krb5/krb/int-proto.h @@ -27,8 +27,6 @@ #ifndef KRB5_INT_FUNC_PROTO__ #define KRB5_INT_FUNC_PROTO__ -/* widen prototypes, if needed */ -#include krb5_error_code krb5_tgtname PROTOTYPE((krb5_context context, @@ -42,8 +40,6 @@ krb5_error_code krb5_get_cred_via_tgt const krb5_enctype, const krb5_cksumtype, krb5_creds * )); -/* and back to normal... */ -#include #endif /* KRB5_INT_FUNC_PROTO__ */ diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c index 5ec3758cf..6b2d08518 100644 --- a/src/lib/krb5/krb/rd_req.c +++ b/src/lib/krb5/krb/rd_req.c @@ -54,14 +54,10 @@ * returns system errors, encryption errors, replay errors */ -/* widen prototypes, if needed */ -#include typedef krb5_error_code (*rdreq_key_proc) PROTOTYPE((krb5_pointer, krb5_principal, krb5_kvno, krb5_keyblock **)); -/* and back to normal... */ -#include krb5_error_code krb5_rd_req(context, inbuf, server, sender_addr, fetchfrom, keyproc, diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c index 463970763..cad8f99b8 100644 --- a/src/lib/krb5/krb/rd_req_dec.c +++ b/src/lib/krb5/krb/rd_req_dec.c @@ -62,18 +62,12 @@ * returns system errors, encryption errors, replay errors */ -/* widen prototypes, if needed */ -#include - static krb5_error_code decrypt_authenticator PROTOTYPE((krb5_context, const krb5_ap_req *, krb5_authenticator **)); typedef krb5_error_code (*rdreq_key_proc) PROTOTYPE((krb5_context, krb5_pointer, krb5_principal, krb5_kvno, krb5_keyblock **)); -/* and back to normal... */ -#include - extern krb5_deltat krb5_clockskew; #define in_clock_skew(date) (abs((date)-currenttime) < krb5_clockskew) diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog index eb780f9db..6a0e60fb8 100644 --- a/src/tests/hammer/ChangeLog +++ b/src/tests/hammer/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 25 16:54:40 1995 Chris Provenzano (proven@mit.edu) + + * Removed all narrow types and references to wide.h and narrow.h + Fri Jan 13 15:23:47 1995 Chris Provenzano (proven@mit.edu) * Added krb5_context to all krb5_routines diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c index d7b0239a1..51bf4c2f7 100644 --- a/src/tests/hammer/kdc5_hammer.c +++ b/src/tests/hammer/kdc5_hammer.c @@ -259,15 +259,13 @@ main(argc, argv) fprintf (stderr, "\nTried %d. Got %d errors.\n", n_tried, errors); } - -#include + krb5_error_code get_server_key(context, keyprocarg, princ, vno, key) krb5_context context; krb5_pointer keyprocarg; krb5_principal princ; krb5_kvno vno; krb5_keyblock ** key; -#include { krb5_encrypt_block eblock; krb5_data pwd, salt; -- 2.26.2