diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2001-10-06 03:14:42 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2001-10-06 03:14:42 +0000 |
| commit | c1d2e4e4deaa5d5df19171539a30c13fc43b7a6f (patch) | |
| tree | b6b4e2f17a5ab2b237a27c2f6c80f659615285bd /src/lib | |
| parent | 2e0ebe3766332b985c79b7ff92476c61fa16326b (diff) | |
| download | krb5-c1d2e4e4deaa5d5df19171539a30c13fc43b7a6f.tar.gz krb5-c1d2e4e4deaa5d5df19171539a30c13fc43b7a6f.tar.xz krb5-c1d2e4e4deaa5d5df19171539a30c13fc43b7a6f.zip | |
Danilo also says we can get rid of _MSDOS (Win16) tests, and explicit FAR/NEAR specs
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13786 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
173 files changed, 790 insertions, 938 deletions
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog index 0a32b0dec..7e1d55f01 100644 --- a/src/lib/ChangeLog +++ b/src/lib/ChangeLog @@ -1,3 +1,9 @@ +2001-10-03 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (RCFLAGS): Don't define _MSDOS_. + + * win_glue.c: Don't explicitly declare pointers FAR any more. + 2001-07-27 Danilo Almeida <dalmeida@mit.edu> * gssapi32.def: Do no export gss_mech_krb5. diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 7c145c6db..db4bf7bf2 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -66,7 +66,7 @@ KGLUE=$(K5_GLUE) GGLUE=$(GSS_GLUE) K4GLUE=$(K4_GLUE) -RCFLAGS=$(CPPFLAGS) -D_WIN32 -D_MSDOS_ -DRES_ONLY +RCFLAGS=$(CPPFLAGS) -D_WIN32 -DRES_ONLY ##WIN32##CRES=$(CLIB:.lib=.res) ##WIN32##PRES=$(PLIB:.lib=.res) diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index 302eb3285..099cbd652 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -6,7 +6,8 @@ keyed_cksum.c, make_checksum.c, make_random_key.c, old_api_glue.c, prng.c, string_to_cksumtype.c, string_to_enctype.c, string_to_key.c, valid_cksumtype.c, valid_enctype.c, - verify_checksum.c: Don't use KRB5_DLLIMP. + verify_checksum.c: Don't use KRB5_DLLIMP. Don't explicitly + declare pointers FAR any more. 2001-09-01 Ken Raeburn <raeburn@mit.edu> diff --git a/src/lib/crypto/cksumtype_to_string.c b/src/lib/crypto/cksumtype_to_string.c index 5464fe300..8c75eaefb 100644 --- a/src/lib/crypto/cksumtype_to_string.c +++ b/src/lib/crypto/cksumtype_to_string.c @@ -30,7 +30,7 @@ krb5_error_code KRB5_CALLCONV krb5_cksumtype_to_string(cksumtype, buffer, buflen) krb5_cksumtype cksumtype; - char FAR * buffer; + char * buffer; size_t buflen; { int i; diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog index 627241754..5379f0135 100644 --- a/src/lib/crypto/crc32/ChangeLog +++ b/src/lib/crypto/crc32/ChangeLog @@ -1,3 +1,7 @@ +2001-10-03 Ken Raeburn <raeburn@mit.edu> + + * crc.c: Don't declare pointers FAR any more. + 2001-03-14 Ken Raeburn <raeburn@mit.edu> * crc-32.h: Stop using PROTOTYPE macro. diff --git a/src/lib/crypto/crc32/crc.c b/src/lib/crypto/crc32/crc.c index 4377f1c5b..9cefe0641 100644 --- a/src/lib/crypto/crc32/crc.c +++ b/src/lib/crypto/crc32/crc.c @@ -154,11 +154,11 @@ crc32_sum_func PROTOTYPE(( const size_t in_length, const krb5_pointer seed, const size_t seed_length, - krb5_checksum FAR *outcksum)); + krb5_checksum *outcksum)); static krb5_error_code crc32_verify_func PROTOTYPE(( - const krb5_checksum FAR *cksum, + const krb5_checksum *cksum, const krb5_pointer in, const size_t in_length, const krb5_pointer seed, @@ -170,7 +170,7 @@ crc32_sum_func(in, in_length, seed, seed_length, outcksum) const size_t in_length; const krb5_pointer seed; const size_t seed_length; - krb5_checksum FAR *outcksum; + krb5_checksum *outcksum; { register u_char *data; register u_long c = 0; @@ -199,7 +199,7 @@ crc32_sum_func(in, in_length, seed, seed_length, outcksum) static krb5_error_code crc32_verify_func(cksum, in, in_length, seed, seed_length) - const krb5_checksum FAR *cksum; + const krb5_checksum *cksum; const krb5_pointer in; const size_t in_length; const krb5_pointer seed; diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index af5eb3bca..6dc684759 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,8 @@ +2001-10-03 Ken Raeburn <raeburn@mit.edu> + + * afsstring2key.c, d3_cbc.c, des_int.h, f_cbc.c, f_cksum.c, + string2key.c: Don't explicitly declare pointers FAR any more. + 2001-06-22 Ken Raeburn <raeburn@mit.edu> * string2key.c (mit_des_string_to_key_int): Undo last change. diff --git a/src/lib/crypto/des/afsstring2key.c b/src/lib/crypto/des/afsstring2key.c index 73cb98af5..8773397f5 100644 --- a/src/lib/crypto/des/afsstring2key.c +++ b/src/lib/crypto/des/afsstring2key.c @@ -68,9 +68,9 @@ static char *afs_crypt (char*,char*,char*); krb5_error_code mit_afs_string_to_key (keyblock, data, salt) - krb5_keyblock FAR * keyblock; - const krb5_data FAR * data; - const krb5_data FAR * salt; + krb5_keyblock * keyblock; + const krb5_data * data; + const krb5_data * salt; { /* totally different approach from MIT string2key. */ /* much of the work has already been done by the only caller diff --git a/src/lib/crypto/des/d3_cbc.c b/src/lib/crypto/des/d3_cbc.c index ca5b075c2..22192cec8 100644 --- a/src/lib/crypto/des/d3_cbc.c +++ b/src/lib/crypto/des/d3_cbc.c @@ -29,8 +29,8 @@ int mit_des3_cbc_encrypt(in, out, length, ks1, ks2, ks3, ivec, enc) - const mit_des_cblock FAR *in; - mit_des_cblock FAR *out; + const mit_des_cblock *in; + mit_des_cblock *out; unsigned long length; const mit_des_key_schedule ks1, ks2, ks3; const mit_des_cblock ivec; diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h index 422b3bda6..686cc3258 100644 --- a/src/lib/crypto/des/des_int.h +++ b/src/lib/crypto/des/des_int.h @@ -146,40 +146,40 @@ error(MIT_DES_KEYSIZE does not equal KRB5_MIT_DES_KEYSIZE) /* afsstring2key.c */ extern krb5_error_code mit_afs_string_to_key - (krb5_keyblock FAR *keyblock, - const krb5_data FAR *data, - const krb5_data FAR *salt); + (krb5_keyblock *keyblock, + const krb5_data *data, + const krb5_data *salt); /* f_cksum.c */ extern unsigned long mit_des_cbc_cksum - (const krb5_octet FAR *, krb5_octet FAR *, unsigned long , - const mit_des_key_schedule, const krb5_octet FAR *); + (const krb5_octet *, krb5_octet *, unsigned long , + const mit_des_key_schedule, const krb5_octet *); /* f_ecb.c */ extern int mit_des_ecb_encrypt - (const mit_des_cblock FAR *, mit_des_cblock FAR *, mit_des_key_schedule , int ); + (const mit_des_cblock *, mit_des_cblock *, mit_des_key_schedule , int ); /* f_cbc.c */ -extern int mit_des_cbc_encrypt (const mit_des_cblock FAR *in, - mit_des_cblock FAR *out, +extern int mit_des_cbc_encrypt (const mit_des_cblock *in, + mit_des_cblock *out, unsigned long length, const mit_des_key_schedule schedule, const mit_des_cblock ivec, int enc); /* fin_rndkey.c */ extern krb5_error_code mit_des_finish_random_key - ( const krb5_encrypt_block FAR *, - krb5_pointer FAR *); + ( const krb5_encrypt_block *, + krb5_pointer *); /* finish_key.c */ extern krb5_error_code mit_des_finish_key - ( krb5_encrypt_block FAR *); + ( krb5_encrypt_block *); /* init_rkey.c */ extern krb5_error_code mit_des_init_random_key - ( const krb5_encrypt_block FAR *, - const krb5_keyblock FAR *, - krb5_pointer FAR *); + ( const krb5_encrypt_block *, + const krb5_keyblock *, + krb5_pointer *); /* key_parity.c */ extern void mit_des_fixup_key_parity (mit_des_cblock ); @@ -191,27 +191,27 @@ extern int mit_des_key_sched /* process_ky.c */ extern krb5_error_code mit_des_process_key - ( krb5_encrypt_block FAR *, const krb5_keyblock FAR *); + ( krb5_encrypt_block *, const krb5_keyblock *); /* random_key.c */ extern krb5_error_code mit_des_random_key - ( const krb5_encrypt_block FAR *, krb5_pointer , - krb5_keyblock FAR * FAR *); + ( const krb5_encrypt_block *, krb5_pointer , + krb5_keyblock **); /* string2key.c */ extern krb5_error_code mit_des_string_to_key - ( const krb5_encrypt_block FAR *, - krb5_keyblock FAR *, const krb5_data FAR *, const krb5_data FAR *); + ( const krb5_encrypt_block *, + krb5_keyblock *, const krb5_data *, const krb5_data *); extern krb5_error_code mit_des_string_to_key_int - (krb5_keyblock FAR *, const krb5_data FAR *, const krb5_data FAR *); + (krb5_keyblock *, const krb5_data *, const krb5_data *); /* weak_key.c */ extern int mit_des_is_weak_key (mit_des_cblock ); /* cmb_keys.c */ krb5_error_code mit_des_combine_subkeys - (const krb5_keyblock FAR *, const krb5_keyblock FAR *, - krb5_keyblock FAR * FAR *); + (const krb5_keyblock *, const krb5_keyblock *, + krb5_keyblock **); /* f_pcbc.c */ int mit_des_pcbc_encrypt (); @@ -222,7 +222,7 @@ int make_key_sched (mit_des_cblock, mit_des_key_schedule); /* misc.c */ -extern void swap_bits (char FAR *); +extern void swap_bits (char *); extern unsigned long long_swap_bits (unsigned long ); extern unsigned long swap_six_bits_to_ansi (unsigned long ); extern unsigned long swap_four_bits_to_ansi (unsigned long ); @@ -239,8 +239,8 @@ extern void test_set (FILE *, const char *, int, const char *, int); /* d3_ecb.c */ extern int mit_des3_ecb_encrypt - (const mit_des_cblock FAR *in, - mit_des_cblock FAR *out, + (const mit_des_cblock *in, + mit_des_cblock *out, mit_des_key_schedule sched1, mit_des_key_schedule sched2, mit_des_key_schedule sched3, @@ -248,8 +248,8 @@ extern int mit_des3_ecb_encrypt /* d3_cbc.c */ extern int mit_des3_cbc_encrypt - (const mit_des_cblock FAR *in, - mit_des_cblock FAR *out, + (const mit_des_cblock *in, + mit_des_cblock *out, unsigned long length, const mit_des_key_schedule ks1, const mit_des_key_schedule ks2, @@ -269,10 +269,10 @@ extern int mit_des3_key_sched /* d3_str2ky.c */ extern krb5_error_code mit_des3_string_to_key - (const krb5_encrypt_block FAR * eblock, - krb5_keyblock FAR * keyblock, - const krb5_data FAR * data, - const krb5_data FAR * salt); + (const krb5_encrypt_block * eblock, + krb5_keyblock * keyblock, + const krb5_data * data, + const krb5_data * salt); /* u_nfold.c */ extern krb5_error_code mit_des_n_fold diff --git a/src/lib/crypto/des/f_cbc.c b/src/lib/crypto/des/f_cbc.c index e02d0bffa..87f64f4db 100644 --- a/src/lib/crypto/des/f_cbc.c +++ b/src/lib/crypto/des/f_cbc.c @@ -38,8 +38,8 @@ int mit_des_cbc_encrypt(in, out, length, schedule, ivec, enc) - const mit_des_cblock FAR *in; - mit_des_cblock FAR *out; + const mit_des_cblock *in; + mit_des_cblock *out; unsigned long length; const mit_des_key_schedule schedule; const mit_des_cblock ivec; diff --git a/src/lib/crypto/des/f_cksum.c b/src/lib/crypto/des/f_cksum.c index 0cfadc112..87b9c7f4b 100644 --- a/src/lib/crypto/des/f_cksum.c +++ b/src/lib/crypto/des/f_cksum.c @@ -30,11 +30,11 @@ unsigned long mit_des_cbc_cksum(in, out, length, schedule, ivec) - const krb5_octet FAR *in; - krb5_octet FAR *out; + const krb5_octet *in; + krb5_octet *out; unsigned long length; const mit_des_key_schedule schedule; - const krb5_octet FAR *ivec; + const krb5_octet *ivec; { register unsigned DES_INT32 left, right; register unsigned DES_INT32 temp; diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c index 65f401410..a400f0701 100644 --- a/src/lib/crypto/des/string2key.c +++ b/src/lib/crypto/des/string2key.c @@ -71,9 +71,9 @@ krb5_error_code mit_des_string_to_key_int (keyblock, data, salt) - krb5_keyblock FAR * keyblock; - const krb5_data FAR * data; - const krb5_data FAR * salt; + krb5_keyblock * keyblock; + const krb5_data * data; + const krb5_data * salt; { register krb5_octet *str, *copystr; register krb5_octet *key; diff --git a/src/lib/crypto/enctype_to_string.c b/src/lib/crypto/enctype_to_string.c index a79dc63b6..42b7d6081 100644 --- a/src/lib/crypto/enctype_to_string.c +++ b/src/lib/crypto/enctype_to_string.c @@ -30,7 +30,7 @@ krb5_error_code KRB5_CALLCONV krb5_enctype_to_string(enctype, buffer, buflen) krb5_enctype enctype; - char FAR * buffer; + char * buffer; size_t buflen; { int i; diff --git a/src/lib/crypto/keyed_checksum_types.c b/src/lib/crypto/keyed_checksum_types.c index 06284b111..46b672cb0 100644 --- a/src/lib/crypto/keyed_checksum_types.c +++ b/src/lib/crypto/keyed_checksum_types.c @@ -86,7 +86,7 @@ krb5_c_keyed_checksum_types(context, enctype, count, cksumtypes) void KRB5_CALLCONV krb5_free_cksumtypes(context, val) krb5_context context; - krb5_cksumtype FAR * val; + krb5_cksumtype * val; { if (val) krb5_xfree(val); diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog index 6cef77085..2117d72e1 100644 --- a/src/lib/crypto/md4/ChangeLog +++ b/src/lib/crypto/md4/ChangeLog @@ -1,3 +1,8 @@ +2001-10-03 Ken Raeburn <raeburn@mit.edu> + + * md4.c, rsa-md4.h: Don't explicitly declare pointers FAR any + more. + 2001-03-14 Ken Raeburn <raeburn@mit.edu> * md4.c (GG, HH, krb5_MD4Init): Use UL suffix on numbers, don't diff --git a/src/lib/crypto/md4/md4.c b/src/lib/crypto/md4/md4.c index 4eb6a577c..36bcb65a9 100644 --- a/src/lib/crypto/md4/md4.c +++ b/src/lib/crypto/md4/md4.c @@ -39,7 +39,7 @@ #include "rsa-md4.h" /* forward declaration */ -static void Transform (krb5_ui_4 FAR *, krb5_ui_4 FAR *); +static void Transform (krb5_ui_4 *, krb5_ui_4 *); static const unsigned char PADDING[64] = { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -77,7 +77,7 @@ static const unsigned char PADDING[64] = { void krb5_MD4Init (mdContext) -krb5_MD4_CTX FAR *mdContext; +krb5_MD4_CTX *mdContext; { mdContext->i[0] = mdContext->i[1] = (krb5_ui_4)0; @@ -91,8 +91,8 @@ krb5_MD4_CTX FAR *mdContext; void krb5_MD4Update (mdContext, inBuf, inLen) -krb5_MD4_CTX FAR *mdContext; -const unsigned char FAR *inBuf; +krb5_MD4_CTX *mdContext; +const unsigned char *inBuf; unsigned int inLen; { krb5_ui_4 in[16]; @@ -127,7 +127,7 @@ unsigned int inLen; void krb5_MD4Final (mdContext) -krb5_MD4_CTX FAR *mdContext; +krb5_MD4_CTX *mdContext; { krb5_ui_4 in[16]; int mdi; @@ -169,8 +169,8 @@ krb5_MD4_CTX FAR *mdContext; /* Basic MD4 step. Transform buf based on in. */ static void Transform (buf, in) -krb5_ui_4 FAR *buf; -krb5_ui_4 FAR *in; +krb5_ui_4 *buf; +krb5_ui_4 *in; { register krb5_ui_4 a = buf[0], b = buf[1], c = buf[2], d = buf[3]; diff --git a/src/lib/crypto/md4/rsa-md4.h b/src/lib/crypto/md4/rsa-md4.h index 7141d0a96..3e58a9797 100644 --- a/src/lib/crypto/md4/rsa-md4.h +++ b/src/lib/crypto/md4/rsa-md4.h @@ -86,9 +86,9 @@ typedef struct { unsigned char digest[16]; /* actual digest after MD4Final call */ } krb5_MD4_CTX; -extern void krb5_MD4Init(krb5_MD4_CTX FAR *); -extern void krb5_MD4Update(krb5_MD4_CTX FAR *, const unsigned char FAR *, unsigned int); -extern void krb5_MD4Final(krb5_MD4_CTX FAR *); +extern void krb5_MD4Init(krb5_MD4_CTX *); +extern void krb5_MD4Update(krb5_MD4_CTX *, const unsigned char *, unsigned int); +extern void krb5_MD4Final(krb5_MD4_CTX *); /* ********************************************************************** diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index 74834d125..47fe11338 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,8 @@ +2001-10-03 Ken Raeburn <raeburn@mit.edu> + + * md5.c, rsa-md5.h: Don't explicitly declare pointers FAR any + more. + 2001-06-12 Ezra Peisach <epeisach@mit.edu> * t_mddriver.c: Cleanup assignments in conditionals w/o parentheses. diff --git a/src/lib/crypto/md5/md5.c b/src/lib/crypto/md5/md5.c index b1fa96cad..98c48e494 100644 --- a/src/lib/crypto/md5/md5.c +++ b/src/lib/crypto/md5/md5.c @@ -50,7 +50,7 @@ */ /* forward declaration */ -static void Transform (krb5_ui_4 FAR *buf, krb5_ui_4 FAR *in); +static void Transform (krb5_ui_4 *buf, krb5_ui_4 *in); static const unsigned char PADDING[64] = { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -108,7 +108,7 @@ static const unsigned char PADDING[64] = { */ void krb5_MD5Init (mdContext) -krb5_MD5_CTX FAR *mdContext; +krb5_MD5_CTX *mdContext; { mdContext->i[0] = mdContext->i[1] = (krb5_ui_4)0; @@ -126,8 +126,8 @@ krb5_MD5_CTX FAR *mdContext; */ void krb5_MD5Update (mdContext, inBuf, inLen) -krb5_MD5_CTX FAR *mdContext; -const unsigned char FAR *inBuf; +krb5_MD5_CTX *mdContext; +const unsigned char *inBuf; unsigned int inLen; { krb5_ui_4 in[16]; @@ -165,7 +165,7 @@ unsigned int inLen; */ void krb5_MD5Final (mdContext) -krb5_MD5_CTX FAR *mdContext; +krb5_MD5_CTX *mdContext; { krb5_ui_4 in[16]; int mdi; @@ -206,8 +206,8 @@ krb5_MD5_CTX FAR *mdContext; /* Basic MD5 step. Transforms buf based on in. */ static void Transform (buf, in) -krb5_ui_4 FAR *buf; -krb5_ui_4 FAR *in; +krb5_ui_4 *buf; +krb5_ui_4 *in; { register krb5_ui_4 a = buf[0], b = buf[1], c = buf[2], d = buf[3]; diff --git a/src/lib/crypto/md5/rsa-md5.h b/src/lib/crypto/md5/rsa-md5.h index 9cb53a6a7..654eae2d9 100644 --- a/src/lib/crypto/md5/rsa-md5.h +++ b/src/lib/crypto/md5/rsa-md5.h @@ -48,9 +48,9 @@ typedef struct { unsigned char digest[16]; /* actual digest after MD5Final call */ } krb5_MD5_CTX; -extern void krb5_MD5Init(krb5_MD5_CTX FAR *); -extern void krb5_MD5Update(krb5_MD5_CTX FAR *,const unsigned char FAR *,unsigned int); -extern void krb5_MD5Final(krb5_MD5_CTX FAR *); +extern void krb5_MD5Init(krb5_MD5_CTX *); +extern void krb5_MD5Update(krb5_MD5_CTX *,const unsigned char *,unsigned int); +extern void krb5_MD5Final(krb5_MD5_CTX *); #define RSA_MD5_CKSUM_LENGTH 16 #define OLD_RSA_MD5_DES_CKSUM_LENGTH 16 diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog index ed05469a2..19067e342 100644 --- a/src/lib/crypto/old/ChangeLog +++ b/src/lib/crypto/old/ChangeLog @@ -1,3 +1,8 @@ +2001-10-03 Ken Raeburn <raeburn@mit.edu> + + * des_stringtokey.c: Don't explicitly declare pointers FAR any + more. + 2001-04-10 Ken Raeburn <raeburn@mit.edu> * old_decrypt.c (krb5_old_decrypt): Fix casts. diff --git a/src/lib/crypto/old/des_stringtokey.c b/src/lib/crypto/old/des_stringtokey.c index 3b4f627a4..55b0c0f44 100644 --- a/src/lib/crypto/old/des_stringtokey.c +++ b/src/lib/crypto/old/des_stringtokey.c @@ -30,9 +30,9 @@ /* XXX */ extern krb5_error_code mit_des_string_to_key_int -KRB5_PROTOTYPE ((krb5_keyblock FAR * keyblock, - const krb5_data FAR * data, - const krb5_data FAR * salt)); +KRB5_PROTOTYPE ((krb5_keyblock * keyblock, + const krb5_data * data, + const krb5_data * salt)); krb5_error_code krb5_des_string_to_key(enc, string, salt, key) diff --git a/src/lib/crypto/old_api_glue.c b/src/lib/crypto/old_api_glue.c index d78ab2423..b6847a6c5 100644 --- a/src/lib/crypto/old_api_glue.c +++ b/src/lib/crypto/old_api_glue.c @@ -32,7 +32,7 @@ krb5_encrypt(context, inptr, outptr, size, eblock, ivec) const krb5_pointer inptr; krb5_pointer outptr; const size_t size; - krb5_encrypt_block FAR * eblock; + krb5_encrypt_block * eblock; krb5_pointer ivec; { krb5_data inputd, ivecd; @@ -71,7 +71,7 @@ krb5_decrypt(context, inptr, outptr, size, eblock, ivec) const krb5_pointer inptr; krb5_pointer outptr; const size_t size; - krb5_encrypt_block FAR * eblock; + krb5_encrypt_block * eblock; krb5_pointer ivec; { krb5_enc_data inputd; @@ -105,8 +105,8 @@ krb5_decrypt(context, inptr, outptr, size, eblock, ivec) krb5_error_code KRB5_CALLCONV krb5_process_key(context, eblock, key) krb5_context context; - krb5_encrypt_block FAR * eblock; - const krb5_keyblock FAR * key; + krb5_encrypt_block * eblock; + const krb5_keyblock * key; { eblock->key = (krb5_keyblock *) key; @@ -116,7 +116,7 @@ krb5_process_key(context, eblock, key) krb5_error_code KRB5_CALLCONV krb5_finish_key(context, eblock) krb5_context context; - krb5_encrypt_block FAR * eblock; + krb5_encrypt_block * eblock; { return(0); } @@ -124,10 +124,10 @@ krb5_finish_key(context, eblock) krb5_error_code KRB5_CALLCONV krb5_string_to_key(context, eblock, keyblock, data, salt) krb5_context context; - const krb5_encrypt_block FAR * eblock; - krb5_keyblock FAR * keyblock; - const krb5_data FAR * data; - const krb5_data FAR * salt; + const krb5_encrypt_block * eblock; + krb5_keyblock * keyblock; + const krb5_data * data; + const krb5_data * salt; { return(krb5_c_string_to_key(context, eblock->crypto_entry, data, salt, keyblock)); @@ -136,9 +136,9 @@ krb5_string_to_key(context, eblock, keyblock, data, salt) krb5_error_code KRB5_CALLCONV krb5_init_random_key(context, eblock, keyblock, ptr) krb5_context context; - const krb5_encrypt_block FAR * eblock; - const krb5_keyblock FAR * keyblock; - krb5_pointer FAR * ptr; + const krb5_encrypt_block * eblock; + const krb5_keyblock * keyblock; + krb5_pointer * ptr; { krb5_data data; @@ -151,8 +151,8 @@ krb5_init_random_key(context, eblock, keyblock, ptr) krb5_error_code KRB5_CALLCONV krb5_finish_random_key(context, eblock, ptr) krb5_context context; - const krb5_encrypt_block FAR * eblock; - krb5_pointer FAR * ptr; + const krb5_encrypt_block * eblock; + krb5_pointer * ptr; { return(0); } @@ -160,9 +160,9 @@ krb5_finish_random_key(context, eblock, ptr) krb5_error_code KRB5_CALLCONV krb5_random_key(context, eblock, ptr, keyblock) krb5_context context; - const krb5_encrypt_block FAR * eblock; + const krb5_encrypt_block * eblock; krb5_pointer ptr; - krb5_keyblock FAR * FAR * keyblock; + krb5_keyblock ** keyblock; { krb5_keyblock *key; krb5_error_code ret; @@ -181,7 +181,7 @@ krb5_random_key(context, eblock, ptr, keyblock) krb5_enctype KRB5_CALLCONV krb5_eblock_enctype(context, eblock) krb5_context context; - const krb5_encrypt_block FAR * eblock; + const krb5_encrypt_block * eblock; { return(eblock->crypto_entry); } @@ -189,7 +189,7 @@ krb5_eblock_enctype(context, eblock) krb5_error_code KRB5_CALLCONV krb5_use_enctype(context, eblock, enctype) krb5_context context; - krb5_encrypt_block FAR * eblock; + krb5_encrypt_block * eblock; const krb5_enctype enctype; { eblock->crypto_entry = enctype; @@ -232,7 +232,7 @@ krb5_calculate_checksum(context, ctype, in, in_length, const size_t in_length; const krb5_pointer seed; const size_t seed_length; - krb5_checksum FAR * outcksum; + krb5_checksum * outcksum; { krb5_data input; krb5_keyblock key; @@ -269,7 +269,7 @@ krb5_verify_checksum(context, ctype, cksum, in, in_length, seed, seed_length) krb5_context context; krb5_cksumtype ctype; - const krb5_checksum FAR * cksum; + const krb5_checksum * cksum; const krb5_pointer in; const size_t in_length; const krb5_pointer seed; diff --git a/src/lib/crypto/string_to_cksumtype.c b/src/lib/crypto/string_to_cksumtype.c index 3ccb9c5f6..873ea9b49 100644 --- a/src/lib/crypto/string_to_cksumtype.c +++ b/src/lib/crypto/string_to_cksumtype.c @@ -29,8 +29,8 @@ krb5_error_code KRB5_CALLCONV krb5_string_to_cksumtype(string, cksumtypep) - char FAR * string; - krb5_cksumtype FAR * cksumtypep; + char * string; + krb5_cksumtype * cksumtypep; { int i; diff --git a/src/lib/crypto/string_to_enctype.c b/src/lib/crypto/string_to_enctype.c index 4485182ba..8862032c6 100644 --- a/src/lib/crypto/string_to_enctype.c +++ b/src/lib/crypto/string_to_enctype.c @@ -29,8 +29,8 @@ krb5_error_code KRB5_CALLCONV krb5_string_to_enctype(string, enctypep) - char FAR * string; - krb5_enctype FAR * enctypep; + char * string; + krb5_enctype * enctypep; { int i; diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 320e07141..c92f6fbdd 100644 --- a/src/lib/des425/ChangeLog +++ b/src/lib/des425/ChangeLog @@ -1,3 +1,9 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * read_passwd.c, unix_time.c: Drop _MSDOS support. + + * quad_cksum.c: Don't explicitly declare pointers FAR any more. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> * des.c, key_sched.c, new_rnd_key.c, des_pcbc_encrypt.c, diff --git a/src/lib/des425/quad_cksum.c b/src/lib/des425/quad_cksum.c index 8c618c8c4..b9ef031ef 100644 --- a/src/lib/des425/quad_cksum.c +++ b/src/lib/des425/quad_cksum.c @@ -129,11 +129,11 @@ extern int des_debug; unsigned long KRB5_CALLCONV des_quad_cksum(in,out,length,out_count,c_seed) - const unsigned char FAR *in; /* input block */ - unsigned DES_INT32 FAR *out; /* optional longer output */ + const unsigned char *in; /* input block */ + unsigned DES_INT32 *out; /* optional longer output */ long length; /* original length in bytes */ int out_count; /* number of iterations */ - mit_des_cblock FAR *c_seed; /* secret seed, 8 bytes */ + mit_des_cblock *c_seed; /* secret seed, 8 bytes */ { /* diff --git a/src/lib/des425/read_passwd.c b/src/lib/des425/read_passwd.c index 586209366..2c77cfdb7 100644 --- a/src/lib/des425/read_passwd.c +++ b/src/lib/des425/read_passwd.c @@ -30,7 +30,7 @@ * echoing. */ -#if !defined(_MSDOS)&&!defined(_WIN32) +#if !defined(_WIN32) #include "des_int.h" #include "des.h" diff --git a/src/lib/des425/unix_time.c b/src/lib/des425/unix_time.c index ae7aee4c4..53ce03b68 100644 --- a/src/lib/des425/unix_time.c +++ b/src/lib/des425/unix_time.c @@ -12,7 +12,7 @@ #include "k5-int.h" -#if !defined(_MSDOS) && !defined(_WIN32) +#if !defined(_WIN32) #include <sys/time.h> krb5_ui_4 @@ -27,7 +27,7 @@ unix_time_gmt_unixsec (usecptr) return now.tv_sec; } -#endif /* !_MSDOS && !_WIN32 */ +#endif /* !_WIN32 */ #ifdef _WIN32 #include <time.h> @@ -44,95 +44,3 @@ unix_time_gmt_unixsec (usecptr) return gmt; } #endif /* _WIN32 */ - -#ifdef MSDOS -/* - * Originally written by John Gilmore, Cygnus Support, May '94. - * Public Domain. - */ - -#include <time.h> -#include <sys/timeb.h> -#include <dos.h> -#include <string.h> - -/* - * Due to the fact that DOS time can be unreliable we have reverted - * to using the AT hardware clock and converting it to Unix time. - */ -static long win_time_get_epoch(void); - -krb5_ui_4 -unix_time_gmt_unixsec (usecptr) - krb5_ui_4 *usecptr; -{ - struct tm tm; - union _REGS inregs; /* For calling BIOS */ - union _REGS outregs; - struct _timeb now; - time_t time; - long convert; /* MSC 7.00 bug work around */ - krb5_ui_4 retval; /* What we return */ - - _ftime(&now); /* Daylight savings time */ - - /* Get time from AT hardware clock INT 0x1A, AH=2 */ - memset(&inregs, 0, sizeof(inregs)); - inregs.h.ah = 2; - _int86(0x1a, &inregs, &outregs); - - /* 0x13 = decimal 13, hence the decoding below */ - tm.tm_sec = 10 * ((outregs.h.dh & 0xF0) >> 4) + (outregs.h.dh & 0x0F); - tm.tm_min = 10 * ((outregs.h.cl & 0xF0) >> 4) + (outregs.h.cl & 0x0F); - tm.tm_hour = 10 * ((outregs.h.ch & 0xF0) >> 4) + (outregs.h.ch & 0x0F); - - /* Get date from AT hardware clock INT 0x1A, AH=4 */ - memset(&inregs, 0, sizeof(inregs)); - inregs.h.ah = 4; - _int86(0x1a, &inregs, &outregs); - - tm.tm_mday = 10 * ((outregs.h.dl & 0xF0) >> 4) + (outregs.h.dl & 0x0F); - tm.tm_mon = 10 * ((outregs.h.dh & 0xF0) >> 4) + (outregs.h.dh & 0x0F) - 1; - tm.tm_year = 10 * ((outregs.h.cl & 0xF0) >> 4) + (outregs.h.cl & 0x0F); - tm.tm_year += 100 * ((10 * (outregs.h.ch & 0xF0) >> 4) - + (outregs.h.ch & 0x0F) - 19); - - tm.tm_wday = 0; - tm.tm_yday = 0; - tm.tm_isdst = now.dstflag; - - time = mktime(&tm); - - convert = win_time_get_epoch(); - retval = time + convert; - - if (usecptr) - *usecptr = retval; - - return retval; -} -/* - * This routine figures out the current time epoch and returns the - * conversion factor. It exists because - * Microloss screwed the pooch on the time() and _ftime() calls in - * its release 7.0 libraries. They changed the epoch to Dec 31, 1899! - * Idiots... We try to cope. - */ - -static struct tm jan_1_70 = {0, 0, 0, 1, 0, 70}; -static long epoch = 0; -static int epoch_set = 0; - -static long -win_time_get_epoch() -{ - - if (!epoch_set) { - epoch = 0 - mktime (&jan_1_70); /* Seconds til 1970 localtime */ - epoch += _timezone; /* Seconds til 1970 GMT */ - epoch_set = 1; - } - return epoch; -} - -#endif diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 1393b7c47..040dce33b 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,10 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * accept_sec_context.c, gssapiP_krb5.h, import_sec_context.c, + krb5_gss_glue.c: Don't explicitly declare pointers FAR any more. + + * pname_to_uid.c: Drop _MSDOS support. + 2001-10-04 Tom Yu <tlyu@mit.edu> * accept_sec_context.c (krb5_gss_accept_sec_context): Ignore diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index 7af8f0332..a3d4a7337 100644 --- a/src/lib/gssapi/krb5/accept_sec_context.c +++ b/src/lib/gssapi/krb5/accept_sec_context.c @@ -492,7 +492,7 @@ krb5_gss_accept_sec_context(minor_status, context_handle, } TREAD_STR(ptr, ptr2, bigend); - option.data = (char FAR *) ptr2; + option.data = (char *) ptr2; i -= option.length; diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h index 2ac5f4d5e..16ba01f91 100644 --- a/src/lib/gssapi/krb5/gssapiP_krb5.h +++ b/src/lib/gssapi/krb5/gssapiP_krb5.h @@ -617,7 +617,7 @@ PROTOTYPE( (OM_uint32 *, /* minor_status */ )); gss_OID krb5_gss_convert_static_mech_oid -PROTOTYPE( (gss_OID FAR oid +PROTOTYPE( (gss_OID oid )); #endif /* _GSSAPIP_KRB5_H_ */ diff --git a/src/lib/gssapi/krb5/import_sec_context.c b/src/lib/gssapi/krb5/import_sec_context.c index fd062fa9b..3745a7c23 100644 --- a/src/lib/gssapi/krb5/import_sec_context.c +++ b/src/lib/gssapi/krb5/import_sec_context.c @@ -35,7 +35,7 @@ * the OID if possible. */ gss_OID krb5_gss_convert_static_mech_oid(oid) - gss_OID FAR oid; + gss_OID oid; { const gss_OID_desc *p; OM_uint32 minor_status; diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c index 1d7152945..540652ad8 100644 --- a/src/lib/gssapi/krb5/krb5_gss_glue.c +++ b/src/lib/gssapi/krb5/krb5_gss_glue.c @@ -30,17 +30,17 @@ OM_uint32 KRB5_CALLCONV gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle, input_token, input_chan_bindings, src_name, mech_type, output_token, ret_flags, time_rec, delegated_cred_handle) - OM_uint32 FAR *minor_status; - gss_ctx_id_t FAR *context_handle; + OM_uint32 *minor_status; + gss_ctx_id_t *context_handle; gss_cred_id_t verifier_cred_handle; gss_buffer_t input_token; gss_channel_bindings_t input_chan_bindings; - gss_name_t FAR *src_name; - gss_OID FAR *mech_type; + gss_name_t *src_name; + gss_OID *mech_type; gss_buffer_t output_token; - OM_uint32 FAR *ret_flags; - OM_uint32 FAR *time_rec; - gss_cred_id_t FAR *delegated_cred_handle; + OM_uint32 *ret_flags; + OM_uint32 *time_rec; + gss_cred_id_t *delegated_cred_handle; { return(krb5_gss_accept_sec_context(minor_status, context_handle, @@ -58,14 +58,14 @@ gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle, OM_uint32 KRB5_CALLCONV gss_acquire_cred(minor_status, desired_name, time_req, desired_mechs, cred_usage, output_cred_handle, actual_mechs, time_rec) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_name_t desired_name; OM_uint32 time_req; gss_OID_set desired_mechs; gss_cred_usage_t cred_usage; - gss_cred_id_t FAR *output_cred_handle; - gss_OID_set FAR *actual_mechs; - OM_uint32 FAR *time_rec; + gss_cred_id_t *output_cred_handle; + gss_OID_set *actual_mechs; + OM_uint32 *time_rec; { return(krb5_gss_acquire_cred(minor_status, desired_name, @@ -83,17 +83,17 @@ gss_add_cred(minor_status, input_cred_handle, desired_name, desired_mech, cred_usage, initiator_time_req, acceptor_time_req, output_cred_handle, actual_mechs, initiator_time_rec, acceptor_time_rec) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_cred_id_t input_cred_handle; gss_name_t desired_name; gss_OID desired_mech; gss_cred_usage_t cred_usage; OM_uint32 initiator_time_req; OM_uint32 acceptor_time_req; - gss_cred_id_t FAR *output_cred_handle; - gss_OID_set FAR *actual_mechs; - OM_uint32 FAR *initiator_time_rec; - OM_uint32 FAR *acceptor_time_rec; + gss_cred_id_t *output_cred_handle; + gss_OID_set *actual_mechs; + OM_uint32 *initiator_time_rec; + OM_uint32 *acceptor_time_rec; { return(krb5_gss_add_cred(minor_status, input_cred_handle, desired_name, desired_mech, cred_usage, initiator_time_req, @@ -105,19 +105,19 @@ gss_add_cred(minor_status, input_cred_handle, desired_name, desired_mech, /* V2 */ OM_uint32 KRB5_CALLCONV gss_add_oid_set_member(minor_status, member_oid, oid_set) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_OID member_oid; - gss_OID_set FAR *oid_set; + gss_OID_set *oid_set; { return(generic_gss_add_oid_set_member(minor_status, member_oid, oid_set)); } OM_uint32 KRB5_CALLCONV gss_compare_name(minor_status, name1, name2, name_equal) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_name_t name1; gss_name_t name2; - int FAR *name_equal; + int *name_equal; { return(krb5_gss_compare_name(minor_status, name1, name2, name_equal)); @@ -125,9 +125,9 @@ gss_compare_name(minor_status, name1, name2, name_equal) OM_uint32 KRB5_CALLCONV gss_context_time(minor_status, context_handle, time_rec) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_ctx_id_t context_handle; - OM_uint32 FAR *time_rec; + OM_uint32 *time_rec; { return(krb5_gss_context_time(minor_status, context_handle, time_rec)); @@ -136,16 +136,16 @@ gss_context_time(minor_status, context_handle, time_rec) /* V2 */ OM_uint32 KRB5_CALLCONV gss_create_empty_oid_set(minor_status, oid_set) - OM_uint32 FAR *minor_status; - gss_OID_set FAR *oid_set; + OM_uint32 *minor_status; + gss_OID_set *oid_set; { return(generic_gss_create_empty_oid_set(minor_status, oid_set)); } OM_uint32 KRB5_CALLCONV gss_delete_sec_context(minor_status, context_handle, output_token) - OM_uint32 FAR *minor_status; - gss_ctx_id_t FAR *context_handle; + OM_uint32 *minor_status; + gss_ctx_id_t *context_handle; gss_buffer_t output_token; { return(krb5_gss_delete_sec_context(minor_status, @@ -154,10 +154,10 @@ gss_delete_sec_context(minor_status, context_handle, output_token) OM_uint32 KRB5_CALLCONV gss_display_name(minor_status, input_name, output_name_buffer, output_name_type) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_name_t input_name; gss_buffer_t output_name_buffer; - gss_OID FAR *output_name_type; + gss_OID *output_name_type; { return(krb5_gss_display_name(minor_status, input_name, output_name_buffer, output_name_type)); @@ -166,11 +166,11 @@ gss_display_name(minor_status, input_name, output_name_buffer, output_name_type) OM_uint32 KRB5_CALLCONV gss_display_status(minor_status, status_value, status_type, mech_type, message_context, status_string) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; OM_uint32 status_value; int status_type; gss_OID mech_type; - OM_uint32 FAR *message_context; + OM_uint32 *message_context; gss_buffer_t status_string; { return(krb5_gss_display_status(minor_status, status_value, @@ -181,8 +181,8 @@ gss_display_status(minor_status, status_value, status_type, /* V2 */ OM_uint32 KRB5_CALLCONV gss_export_sec_context(minor_status, context_handle, interprocess_token) - OM_uint32 FAR *minor_status; - gss_ctx_id_t FAR *context_handle; + OM_uint32 *minor_status; + gss_ctx_id_t *context_handle; gss_buffer_t interprocess_token; { return(krb5_gss_export_sec_context(minor_status, @@ -194,7 +194,7 @@ gss_export_sec_context(minor_status, context_handle, interprocess_token) OM_uint32 KRB5_CALLCONV gss_get_mic(minor_status, context_handle, qop_req, message_buffer, message_token) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_ctx_id_t context_handle; gss_qop_t qop_req; gss_buffer_t message_buffer; @@ -206,10 +206,10 @@ gss_get_mic(minor_status, context_handle, qop_req, OM_uint32 KRB5_CALLCONV gss_import_name(minor_status, input_name_buffer, input_name_type, output_name) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_buffer_t input_name_buffer; gss_OID input_name_type; - gss_name_t FAR *output_name; + gss_name_t *output_name; { return(krb5_gss_import_name(minor_status, input_name_buffer, input_name_type, output_name)); @@ -218,9 +218,9 @@ gss_import_name(minor_status, input_name_buffer, input_name_type, output_name) /* V2 */ OM_uint32 KRB5_CALLCONV gss_import_sec_context(minor_status, interprocess_token, context_handle) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_buffer_t interprocess_token; - gss_ctx_id_t FAR *context_handle; + gss_ctx_id_t *context_handle; { return(krb5_gss_import_sec_context(minor_status, interprocess_token, @@ -229,8 +229,8 @@ gss_import_sec_context(minor_status, interprocess_token, context_handle) OM_uint32 KRB5_CALLCONV gss_indicate_mechs(minor_status, mech_set) - OM_uint32 FAR *minor_status; - gss_OID_set FAR *mech_set; + OM_uint32 *minor_status; + gss_OID_set *mech_set; { return(krb5_gss_indicate_mechs(minor_status, mech_set)); } @@ -240,19 +240,19 @@ gss_init_sec_context(minor_status, claimant_cred_handle, context_handle, target_name, mech_type, req_flags, time_req, input_chan_bindings, input_token, actual_mech_type, output_token, ret_flags, time_rec) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_cred_id_t claimant_cred_handle; - gss_ctx_id_t FAR *context_handle; + gss_ctx_id_t *context_handle; gss_name_t target_name; gss_OID mech_type; OM_uint32 req_flags; OM_uint32 time_req; gss_channel_bindings_t input_chan_bindings; gss_buffer_t input_token; - gss_OID FAR *actual_mech_type; + gss_OID *actual_mech_type; gss_buffer_t output_token; - OM_uint32 FAR *ret_flags; - OM_uint32 FAR *time_rec; + OM_uint32 *ret_flags; + OM_uint32 *time_rec; { return(krb5_gss_init_sec_context(minor_status, claimant_cred_handle, context_handle, @@ -266,15 +266,15 @@ OM_uint32 KRB5_CALLCONV gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name, lifetime_rec, mech_type, ret_flags, locally_initiated, open) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_ctx_id_t context_handle; - gss_name_t FAR *initiator_name; - gss_name_t FAR *acceptor_name; - OM_uint32 FAR *lifetime_rec; - gss_OID FAR *mech_type; - OM_uint32 FAR *ret_flags; - int FAR *locally_initiated; - int FAR *open; + gss_name_t *initiator_name; + gss_name_t *acceptor_name; + OM_uint32 *lifetime_rec; + gss_OID *mech_type; + OM_uint32 *ret_flags; + int *locally_initiated; + int *open; { return(krb5_gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name, lifetime_rec, @@ -285,12 +285,12 @@ gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name, OM_uint32 KRB5_CALLCONV gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret, cred_usage, mechanisms) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_cred_id_t cred_handle; - gss_name_t FAR *name; - OM_uint32 FAR *lifetime_ret; - gss_cred_usage_t FAR *cred_usage; - gss_OID_set FAR *mechanisms; + gss_name_t *name; + OM_uint32 *lifetime_ret; + gss_cred_usage_t *cred_usage; + gss_OID_set *mechanisms; { return(krb5_gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret, cred_usage, mechanisms)); @@ -300,13 +300,13 @@ gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret, OM_uint32 KRB5_CALLCONV gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name, initiator_lifetime, acceptor_lifetime, cred_usage) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_cred_id_t cred_handle; gss_OID mech_type; - gss_name_t FAR *name; - OM_uint32 FAR *initiator_lifetime; - OM_uint32 FAR *acceptor_lifetime; - gss_cred_usage_t FAR *cred_usage; + gss_name_t *name; + OM_uint32 *initiator_lifetime; + OM_uint32 *acceptor_lifetime; + gss_cred_usage_t *cred_usage; { return(krb5_gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name, initiator_lifetime, @@ -316,9 +316,9 @@ gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name, /* V2 */ OM_uint32 KRB5_CALLCONV gss_inquire_names_for_mech(minor_status, mechanism, name_types) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_OID mechanism; - gss_OID_set FAR *name_types; + gss_OID_set *name_types; { return(krb5_gss_inquire_names_for_mech(minor_status, mechanism, @@ -328,7 +328,7 @@ gss_inquire_names_for_mech(minor_status, mechanism, name_types) /* V2 */ OM_uint32 KRB5_CALLCONV gss_oid_to_str(minor_status, oid, oid_str) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_OID oid; gss_buffer_t oid_str; { @@ -337,7 +337,7 @@ gss_oid_to_str(minor_status, oid, oid_str) OM_uint32 KRB5_CALLCONV gss_process_context_token(minor_status, context_handle, token_buffer) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_ctx_id_t context_handle; gss_buffer_t token_buffer; { @@ -347,23 +347,23 @@ gss_process_context_token(minor_status, context_handle, token_buffer) OM_uint32 KRB5_CALLCONV gss_release_cred(minor_status, cred_handle) - OM_uint32 FAR *minor_status; - gss_cred_id_t FAR *cred_handle; + OM_uint32 *minor_status; + gss_cred_id_t *cred_handle; { return(krb5_gss_release_cred(minor_status, cred_handle)); } OM_uint32 KRB5_CALLCONV gss_release_name(minor_status, input_name) - OM_uint32 FAR *minor_status; - gss_name_t FAR *input_name; + OM_uint32 *minor_status; + gss_name_t *input_name; { return(krb5_gss_release_name(minor_status, input_name)); } OM_uint32 KRB5_CALLCONV gss_release_buffer(minor_status, buffer) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_buffer_t buffer; { return(generic_gss_release_buffer(minor_status, @@ -373,16 +373,16 @@ gss_release_buffer(minor_status, buffer) /* V2 */ OM_uint32 KRB5_CALLCONV gss_release_oid(minor_status, oid) - OM_uint32 FAR *minor_status; - gss_OID FAR *oid; + OM_uint32 *minor_status; + gss_OID *oid; { return(krb5_gss_release_oid(minor_status, oid)); } OM_uint32 KRB5_CALLCONV gss_release_oid_set(minor_status, set) - OM_uint32 FAR * minor_status; - gss_OID_set FAR *set; + OM_uint32 * minor_status; + gss_OID_set *set; { return(generic_gss_release_oid_set(minor_status, set)); } @@ -391,12 +391,12 @@ gss_release_oid_set(minor_status, set) OM_uint32 KRB5_CALLCONV gss_seal(minor_status, context_handle, conf_req_flag, qop_req, input_message_buffer, conf_state, output_message_buffer) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_ctx_id_t context_handle; int conf_req_flag; int qop_req; gss_buffer_t input_message_buffer; - int FAR *conf_state; + int *conf_state; gss_buffer_t output_message_buffer; { return(krb5_gss_seal(minor_status, context_handle, @@ -408,7 +408,7 @@ OM_uint32 KRB5_CALLCONV gss_sign(minor_status, context_handle, qop_req, message_buffer, message_token) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_ctx_id_t context_handle; int qop_req; gss_buffer_t message_buffer; @@ -422,11 +422,11 @@ gss_sign(minor_status, context_handle, OM_uint32 KRB5_CALLCONV gss_verify_mic(minor_status, context_handle, message_buffer, token_buffer, qop_state) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_ctx_id_t context_handle; gss_buffer_t message_buffer; gss_buffer_t token_buffer; - gss_qop_t FAR *qop_state; + gss_qop_t *qop_state; { return(krb5_gss_verify_mic(minor_status, context_handle, message_buffer, token_buffer, qop_state)); @@ -436,12 +436,12 @@ gss_verify_mic(minor_status, context_handle, OM_uint32 KRB5_CALLCONV gss_wrap(minor_status, context_handle, conf_req_flag, qop_req, input_message_buffer, conf_state, output_message_buffer) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_ctx_id_t context_handle; int conf_req_flag; gss_qop_t qop_req; gss_buffer_t input_message_buffer; - int FAR *conf_state; + int *conf_state; gss_buffer_t output_message_buffer; { return(krb5_gss_wrap(minor_status, context_handle, conf_req_flag, qop_req, @@ -452,9 +452,9 @@ gss_wrap(minor_status, context_handle, conf_req_flag, qop_req, /* V2 */ OM_uint32 KRB5_CALLCONV gss_str_to_oid(minor_status, oid_str, oid) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_buffer_t oid_str; - gss_OID FAR *oid; + gss_OID *oid; { return(generic_gss_str_to_oid(minor_status, oid_str, oid)); } @@ -462,10 +462,10 @@ gss_str_to_oid(minor_status, oid_str, oid) /* V2 */ OM_uint32 KRB5_CALLCONV gss_test_oid_set_member(minor_status, member, set, present) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_OID member; gss_OID_set set; - int FAR *present; + int *present; { return(generic_gss_test_oid_set_member(minor_status, member, set, present)); @@ -475,12 +475,12 @@ gss_test_oid_set_member(minor_status, member, set, present) OM_uint32 KRB5_CALLCONV gss_unseal(minor_status, context_handle, input_message_buffer, output_message_buffer, conf_state, qop_state) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_ctx_id_t context_handle; gss_buffer_t input_message_buffer; gss_buffer_t output_message_buffer; - int FAR *conf_state; - int FAR *qop_state; + int *conf_state; + int *qop_state; { return(krb5_gss_unseal(minor_status, context_handle, input_message_buffer, output_message_buffer, @@ -491,12 +491,12 @@ gss_unseal(minor_status, context_handle, input_message_buffer, OM_uint32 KRB5_CALLCONV gss_unwrap(minor_status, context_handle, input_message_buffer, output_message_buffer, conf_state, qop_state) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_ctx_id_t context_handle; gss_buffer_t input_message_buffer; gss_buffer_t output_message_buffer; - int FAR *conf_state; - gss_qop_t FAR *qop_state; + int *conf_state; + gss_qop_t *qop_state; { return(krb5_gss_unwrap(minor_status, context_handle, input_message_buffer, output_message_buffer, conf_state, qop_state)); @@ -506,11 +506,11 @@ gss_unwrap(minor_status, context_handle, input_message_buffer, OM_uint32 KRB5_CALLCONV gss_verify(minor_status, context_handle, message_buffer, token_buffer, qop_state) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_ctx_id_t context_handle; gss_buffer_t message_buffer; gss_buffer_t token_buffer; - int FAR *qop_state; + int *qop_state; { return(krb5_gss_verify(minor_status, context_handle, @@ -523,12 +523,12 @@ gss_verify(minor_status, context_handle, message_buffer, OM_uint32 KRB5_CALLCONV gss_wrap_size_limit(minor_status, context_handle, conf_req_flag, qop_req, req_output_size, max_input_size) - OM_uint32 FAR *minor_status; + OM_uint32 *minor_status; gss_ctx_id_t context_handle; int conf_req_flag; gss_qop_t qop_req; OM_uint32 req_output_size; - OM_uint32 FAR *max_input_size; + OM_uint32 *max_input_size; { return(krb5_gss_wrap_size_limit(minor_status, context_handle, conf_req_flag, qop_req, diff --git a/src/lib/gssapi/krb5/pname_to_uid.c b/src/lib/gssapi/krb5/pname_to_uid.c index 3bdad3f97..f851146bc 100644 --- a/src/lib/gssapi/krb5/pname_to_uid.c +++ b/src/lib/gssapi/krb5/pname_to_uid.c @@ -25,14 +25,14 @@ */ #include "gssapiP_krb5.h" -#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh) +#if !defined(_WIN32) && !defined(macintosh) #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif #include <string.h> #include <pwd.h> #include <sys/types.h> -#endif /* !_MSDOS && !macintosh */ +#endif /* !_WIN32 && !macintosh */ /* * This function will probably get replaced with the gsscred stuff... @@ -46,7 +46,7 @@ gss_OID name_type; gss_OID mech_type; uid_t * uid; { -#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh) +#if defined(_WIN32) || defined(macintosh) return (0); /* failure */ #else diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog index 9e546e279..8c6061ee4 100644 --- a/src/lib/gssapi/mechglue/ChangeLog +++ b/src/lib/gssapi/mechglue/ChangeLog @@ -1,3 +1,9 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * g_initialize.c, mglueP.h: Drop _MSDOS support. + + * g_init_sec_context.c: Don't declare pointers FAR any more. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> * g_acquire_cred.c, g_oid_ops.c: Don't use GSS_DLLIMP. diff --git a/src/lib/gssapi/mechglue/g_init_sec_context.c b/src/lib/gssapi/mechglue/g_init_sec_context.c index 1e19c57e4..4ff47f899 100644 --- a/src/lib/gssapi/mechglue/g_init_sec_context.c +++ b/src/lib/gssapi/mechglue/g_init_sec_context.c @@ -52,7 +52,7 @@ gss_init_sec_context (minor_status, ret_flags, time_rec) -OM_uint32 FAR * minor_status; +OM_uint32 * minor_status; gss_cred_id_t claimant_cred_handle; gss_ctx_id_t * context_handle; gss_name_t target_name; @@ -61,10 +61,10 @@ OM_uint32 req_flags; OM_uint32 time_req; gss_channel_bindings_t input_chan_bindings; gss_buffer_t input_token; -gss_OID FAR * actual_mech_type; +gss_OID * actual_mech_type; gss_buffer_t output_token; -OM_uint32 FAR * ret_flags; -OM_uint32 FAR * time_rec; +OM_uint32 * ret_flags; +OM_uint32 * time_rec; { OM_uint32 status, temp_status, temp_minor_status; diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c index 45310a7a9..563450fc9 100644 --- a/src/lib/gssapi/mechglue/g_initialize.c +++ b/src/lib/gssapi/mechglue/g_initialize.c @@ -157,7 +157,7 @@ void gss_initialize () #endif /* USE_SOLARIS_SHARED_LIBRARIES */ -#if !defined(_MSDOS) && !defined(macintosh) +#if !defined(macintosh) if (__gss_mechs_array == NULL) { /* this is very bad! */ fprintf(stderr,"gss_initialize fatal error: no mechanisms loaded!\n"); exit(-1); diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h index 22b8c5bdb..0a526ba08 100644 --- a/src/lib/gssapi/mechglue/mglueP.h +++ b/src/lib/gssapi/mechglue/mglueP.h @@ -12,10 +12,6 @@ #include "mechglue.h" -#ifdef _MSDOS -#include <malloc.h> -#endif - /* * Array of context IDs typed by mechanism OID */ diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog index aef485371..fe1d91d0f 100644 --- a/src/lib/kadm5/ChangeLog +++ b/src/lib/kadm5/ChangeLog @@ -1,3 +1,7 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * logger.c: Drop _MSDOS support. + 2001-09-25 Ken Raeburn <raeburn@mit.edu> * admin.h (krb5_realm_params): Add fields realm_reject_bad_transit diff --git a/src/lib/kadm5/logger.c b/src/lib/kadm5/logger.c index 3baad4801..065e8b243 100644 --- a/src/lib/kadm5/logger.c +++ b/src/lib/kadm5/logger.c @@ -25,8 +25,6 @@ * */ -#if !defined(_MSDOS) - /* KADM5 wants non-syslog log files to contain syslog-like entries */ #define VERBOSE_LOGS @@ -987,6 +985,3 @@ krb5_context kcontext; } } } - -#endif /* !defined(_MSDOS) */ - diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 3073ae40c..84106b5e6 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,13 +1,14 @@ 2001-10-03 Ken Raeburn <raeburn@mit.edu> - * dest_tkt.c, err_tkt.c, g_admhst.c, g_cred.c, g_krbhst.c, + * dest_tkt.c, err_txt.c, g_admhst.c, g_cred.c, g_krbhst.c, g_krbrlm.c, g_phost.c, g_pw_in_tkt.c, g_pw_tkt.c, g_svc_in_tkt.c, g_tf_fname.c, g_tf_realm.c, g_tkt_svc.c, in_tkt.c, kname_parse.c, kuserok.c, lifetime.c, memcache.c, mk_auth.c, mk_err.c, mk_priv.c, mk_req.c, mk_safe.c, put_svc_key.c, rd_err.c, rd_priv.c, rd_req.c, rd_safe.c, rd_svc_key.c, realmofhost.c, recvauth.c, save_creds.c, - sendauth.c, tf_util.c, unix_time.c, win_store.c: Don't use - KRB5_DLLIMP. + send_to_kdc.c, sendauth.c, tf_util.c, unix_time.c, win_glue.c, + win_store.c: Don't use KRB5_DLLIMP. Don't explicitly declare + pointers FAR any more. 2001-09-28 Ken Raeburn <raeburn@mit.edu> diff --git a/src/lib/krb4/err_txt.c b/src/lib/krb4/err_txt.c index 46272c5ec..0a6fdeb49 100644 --- a/src/lib/krb4/err_txt.c +++ b/src/lib/krb4/err_txt.c @@ -22,7 +22,7 @@ const #ifdef MULTIDIMENSIONAL_ERR_TXT char krb_err_txt[256][60] = { #else - char FAR *const krb_err_txt [256] = { + char *const krb_err_txt [256] = { #endif "OK", /* 000 */ "Principal expired (kerberos)", /* 001 */ @@ -283,7 +283,7 @@ const }; -const char FAR * KRB5_CALLCONV +const char * KRB5_CALLCONV krb_get_err_text (code) int code; { diff --git a/src/lib/krb4/g_admhst.c b/src/lib/krb4/g_admhst.c index 1222fb854..9d844a990 100644 --- a/src/lib/krb4/g_admhst.c +++ b/src/lib/krb4/g_admhst.c @@ -37,8 +37,8 @@ int KRB5_CALLCONV krb_get_admhst(h, r, n) - char FAR *h; - char FAR *r; + char *h; + char *r; int n; { FILE *cnffile; diff --git a/src/lib/krb4/g_cred.c b/src/lib/krb4/g_cred.c index 4660fd42a..498a5f106 100644 --- a/src/lib/krb4/g_cred.c +++ b/src/lib/krb4/g_cred.c @@ -24,10 +24,10 @@ int KRB5_CALLCONV krb_get_cred(service,instance,realm,c) - char FAR *service; /* Service name */ - char FAR *instance; /* Instance */ - char FAR *realm; /* Auth domain */ - CREDENTIALS FAR *c; /* Credentials struct */ + char *service; /* Service name */ + char *instance; /* Instance */ + char *realm; /* Auth domain */ + CREDENTIALS *c; /* Credentials struct */ { int tf_status; /* return value of tf function calls */ diff --git a/src/lib/krb4/g_krbhst.c b/src/lib/krb4/g_krbhst.c index fb7e7e428..b6068cd58 100644 --- a/src/lib/krb4/g_krbhst.c +++ b/src/lib/krb4/g_krbhst.c @@ -66,8 +66,8 @@ get_krbhst_default(h, r, n) int KRB5_CALLCONV krb_get_krbhst(h,r,n) - char FAR *h; - char FAR *r; + char *h; + char *r; int n; { FILE *cnffile; diff --git a/src/lib/krb4/g_phost.c b/src/lib/krb4/g_phost.c index 02643a832..c9ed5d349 100644 --- a/src/lib/krb4/g_phost.c +++ b/src/lib/krb4/g_phost.c @@ -48,11 +48,11 @@ * to the original "alias" argument is returned. */ -char FAR * KRB5_CALLCONV +char * KRB5_CALLCONV krb_get_phost(alias) - char FAR *alias; + char *alias; { - struct hostent FAR *h; + struct hostent *h; char *p; unsigned char *ucp; static char hostname_mem[MAXHOSTNAMELEN]; @@ -75,7 +75,7 @@ krb_get_phost(alias) return (0); } #endif - /* We don't want to return a FAR *, so we copy to a safe location. */ + /* We don't want to return a *, so we copy to a safe location. */ strncpy (hostname_mem, h->h_name, sizeof (hostname_mem)); /* Bail out if h_name is too long. */ if (hostname_mem[MAXHOSTNAMELEN-1] != '\0') diff --git a/src/lib/krb4/g_pw_in_tkt.c b/src/lib/krb4/g_pw_in_tkt.c index ad6ad867a..f878b77bd 100644 --- a/src/lib/krb4/g_pw_in_tkt.c +++ b/src/lib/krb4/g_pw_in_tkt.c @@ -95,9 +95,9 @@ passwd_to_key(user,instance,realm,passwd,key) int KRB5_CALLCONV krb_get_pw_in_tkt(user,instance,realm,service,sinstance,life,password) - char FAR *user, FAR *instance, FAR *realm, FAR *service, FAR *sinstance; + char *user, *instance, *realm, *service, *sinstance; int life; - char FAR *password; + char *password; { #if defined(_WINDOWS) || defined(macintosh) /* In spite of the comments above, we don't allow that path here, @@ -134,9 +134,9 @@ static int stub_key(user,instance,realm,passwd,key) int KRB5_CALLCONV krb_get_pw_in_tkt_preauth(user,instance,realm,service,sinstance,life,password) - char FAR *user, FAR *instance, FAR *realm, FAR *service, FAR *sinstance; + char *user, *instance, *realm, *service, *sinstance; int life; - char FAR *password; + char *password; { char *preauth_p; int preauth_len; diff --git a/src/lib/krb4/g_svc_in_tkt.c b/src/lib/krb4/g_svc_in_tkt.c index 1b057611e..b41126dca 100644 --- a/src/lib/krb4/g_svc_in_tkt.c +++ b/src/lib/krb4/g_svc_in_tkt.c @@ -63,9 +63,9 @@ static int srvtab_to_key(user, instance, realm, srvtab, key) int KRB5_CALLCONV krb_get_svc_in_tkt(user, instance, realm, service, sinstance, life, srvtab) - char FAR *user, FAR *instance, FAR *realm, FAR *service, FAR *sinstance; + char *user, *instance, *realm, *service, *sinstance; int life; - char FAR *srvtab; + char *srvtab; { return(krb_get_in_tkt(user, instance, realm, service, sinstance, life, (key_proc_type) srvtab_to_key, NULL, srvtab)); diff --git a/src/lib/krb4/g_tkt_svc.c b/src/lib/krb4/g_tkt_svc.c index 329cb9493..a9e0db1c7 100644 --- a/src/lib/krb4/g_tkt_svc.c +++ b/src/lib/krb4/g_tkt_svc.c @@ -106,13 +106,13 @@ CredIsExpired( cr ) int KRB5_CALLCONV krb_get_ticket_for_service (serviceName, buf, buflen, checksum, sessionKey, schedule, version, includeVersion) - char FAR *serviceName; - char FAR *buf; - unsigned KRB4_32 FAR *buflen; + char *serviceName; + char *buf; + unsigned KRB4_32 *buflen; int checksum; des_cblock sessionKey; Key_schedule schedule; - char FAR *version; + char *version; int includeVersion; { char service[SNAME_SZ]; diff --git a/src/lib/krb4/kname_parse.c b/src/lib/krb4/kname_parse.c index b5157effa..13f844511 100644 --- a/src/lib/krb4/kname_parse.c +++ b/src/lib/krb4/kname_parse.c @@ -73,10 +73,10 @@ int KRB5_CALLCONV kname_parse(np, ip, rp, fullname) - char FAR *np; - char FAR *ip; - char FAR *rp; - char FAR *fullname; + char *np; + char *ip; + char *rp; + char *fullname; { char buf[FULL_SZ]; char *rnext, *wnext; /* next char to read, write */ @@ -176,7 +176,7 @@ kname_parse(np, ip, rp, fullname) int KRB5_CALLCONV k_isname(s) - char FAR *s; + char *s; { register char c; int backslash = 0; @@ -215,7 +215,7 @@ k_isname(s) int KRB5_CALLCONV k_isinst(s) - char FAR *s; + char *s; { register char c; int backslash = 0; @@ -246,7 +246,7 @@ k_isinst(s) int KRB5_CALLCONV k_isrealm(s) - char FAR *s; + char *s; { register char c; int backslash = 0; diff --git a/src/lib/krb4/kuserok.c b/src/lib/krb4/kuserok.c index 2ac2998c8..f94ee8101 100644 --- a/src/lib/krb4/kuserok.c +++ b/src/lib/krb4/kuserok.c @@ -97,8 +97,8 @@ parmtable kparm[] = { int KRB5_CALLCONV kuserok(kdata, luser) - AUTH_DAT FAR *kdata; - char FAR *luser; + AUTH_DAT *kdata; + char *luser; { struct stat sbuf; struct passwd *pwd; diff --git a/src/lib/krb4/memcache.c b/src/lib/krb4/memcache.c index 5ca7c076f..ea5f1eeaa 100644 --- a/src/lib/krb4/memcache.c +++ b/src/lib/krb4/memcache.c @@ -61,7 +61,7 @@ static Session **fSessions = 0; #if defined (_WINDOWS) || defined (unix) /* Fake Mac handles up for general use. */ -#define Handle char FAR * FAR * +#define Handle char ** #define Size int static OSErr memerror = noErr; diff --git a/src/lib/krb4/mk_auth.c b/src/lib/krb4/mk_auth.c index a6c1d9f82..96d3dd3f1 100644 --- a/src/lib/krb4/mk_auth.c +++ b/src/lib/krb4/mk_auth.c @@ -119,11 +119,11 @@ krb_mk_auth(options, ticket, service, inst, realm, checksum, version, buf) long options; /* bit-pattern of options */ KTEXT ticket; /* where to put ticket (return); or supplied in case of KOPT_DONT_MK_REQ */ - char FAR *service; /* service name */ - char FAR *inst; /* instance (OUTPUT canonicalized) */ - char FAR *realm; /* realm */ + char *service; /* service name */ + char *inst; /* instance (OUTPUT canonicalized) */ + char *realm; /* realm */ unsigned KRB4_32 checksum; /* checksum to include in request */ - char FAR *version; /* version string */ + char *version; /* version string */ KTEXT buf; /* Output buffer to fill */ { int rem; @@ -213,11 +213,11 @@ int KRB5_CALLCONV krb_check_auth (buf, checksum, msg_data, session, schedule, laddr, faddr) KTEXT buf; /* The response we read from app server */ unsigned KRB4_32 checksum; /* checksum we included in request */ - MSG_DAT FAR *msg_data; /* mutual auth MSG_DAT (return) */ + MSG_DAT *msg_data; /* mutual auth MSG_DAT (return) */ C_Block session; /* credentials (input) */ Key_schedule schedule; /* key schedule (return) */ - struct sockaddr_in FAR *laddr; /* local address */ - struct sockaddr_in FAR *faddr; /* address of foreign host on fd */ + struct sockaddr_in *laddr; /* local address */ + struct sockaddr_in *faddr; /* address of foreign host on fd */ { int cc; unsigned KRB4_32 cksum; diff --git a/src/lib/krb4/mk_err.c b/src/lib/krb4/mk_err.c index 21546607f..5eeca1bdb 100644 --- a/src/lib/krb4/mk_err.c +++ b/src/lib/krb4/mk_err.c @@ -50,9 +50,9 @@ long KRB5_CALLCONV krb_mk_err(p, e, e_string) - u_char FAR *p; /* Where to build error packet */ + u_char *p; /* Where to build error packet */ KRB4_32 e; /* Error code */ - char FAR *e_string; /* Text of error */ + char *e_string; /* Text of error */ { u_char *start; size_t e_len; diff --git a/src/lib/krb4/mk_priv.c b/src/lib/krb4/mk_priv.c index 17bd64d6c..bc9f9bcf1 100644 --- a/src/lib/krb4/mk_priv.c +++ b/src/lib/krb4/mk_priv.c @@ -95,15 +95,15 @@ extern int krb_debug; long KRB5_CALLCONV krb_mk_priv(in, out, length, schedule, key, sender, receiver) - u_char FAR *in; /* application data */ - u_char FAR *out; /* put msg here, leave room for + u_char *in; /* application data */ + u_char *out; /* put msg here, leave room for * header! breaks if in and out * (header stuff) overlap */ unsigned KRB4_32 length; /* of in data */ Key_schedule schedule; /* precomputed key schedule */ - C_Block FAR *key; /* encryption key for seed and ivec */ - struct sockaddr_in FAR *sender; /* sender address */ - struct sockaddr_in FAR *receiver; /* receiver address */ + C_Block *key; /* encryption key for seed and ivec */ + struct sockaddr_in *sender; /* sender address */ + struct sockaddr_in *receiver; /* receiver address */ { register u_char *p,*q; u_char *c_length_ptr; diff --git a/src/lib/krb4/mk_req.c b/src/lib/krb4/mk_req.c index fa301ffba..27b9d9adc 100644 --- a/src/lib/krb4/mk_req.c +++ b/src/lib/krb4/mk_req.c @@ -87,9 +87,9 @@ static int lifetime = 255; /* Default based on the TGT */ int KRB5_CALLCONV krb_mk_req(authent, service, instance, realm, checksum) register KTEXT authent; /* Place to build the authenticator */ - char FAR *service; /* Name of the service */ - char FAR *instance; /* Service instance */ - char FAR *realm; /* Authentication domain of service */ + char *service; /* Name of the service */ + char *instance; /* Service instance */ + char *realm; /* Authentication domain of service */ KRB4_32 checksum; /* Checksum of data (optional) */ { KTEXT_ST req_st; /* Temp storage for req id */ diff --git a/src/lib/krb4/mk_safe.c b/src/lib/krb4/mk_safe.c index 1cc5fc21f..f4bb0a660 100644 --- a/src/lib/krb4/mk_safe.c +++ b/src/lib/krb4/mk_safe.c @@ -84,7 +84,7 @@ krb_mk_safe(in, out, length, key, sender, receiver) * overlap */ unsigned KRB4_32 length; /* of in data */ - C_Block FAR *key; /* encryption key for seed and ivec */ + C_Block *key; /* encryption key for seed and ivec */ struct sockaddr_in *sender; /* sender address */ struct sockaddr_in *receiver; /* receiver address */ { diff --git a/src/lib/krb4/put_svc_key.c b/src/lib/krb4/put_svc_key.c index 787901422..d31b0a36c 100644 --- a/src/lib/krb4/put_svc_key.c +++ b/src/lib/krb4/put_svc_key.c @@ -40,12 +40,12 @@ */ int KRB5_CALLCONV put_svc_key(sfile,name,inst,realm,newvno,key) - char FAR *sfile; - char FAR *name; - char FAR *inst; - char FAR *realm; + char *sfile; + char *name; + char *inst; + char *realm; int newvno; - char FAR *key; + char *key; { int fd; char fname[SNAME_SZ], finst[INST_SZ], frlm[REALM_SZ]; diff --git a/src/lib/krb4/rd_err.c b/src/lib/krb4/rd_err.c index 90964df95..47f5167b5 100644 --- a/src/lib/krb4/rd_err.c +++ b/src/lib/krb4/rd_err.c @@ -48,10 +48,10 @@ int KRB5_CALLCONV krb_rd_err(in, in_length, code, m_data) - u_char FAR *in; /* pointer to the msg received */ + u_char *in; /* pointer to the msg received */ u_long in_length; /* of in msg */ - long FAR *code; /* received error code */ - MSG_DAT FAR *m_data; + long *code; /* received error code */ + MSG_DAT *m_data; { register u_char *p; int le; diff --git a/src/lib/krb4/rd_priv.c b/src/lib/krb4/rd_priv.c index 5a99be88d..e7b42a0fa 100644 --- a/src/lib/krb4/rd_priv.c +++ b/src/lib/krb4/rd_priv.c @@ -84,7 +84,7 @@ krb_rd_priv(in, in_length, schedule, key, sender, receiver, m_data) u_char *in; /* pointer to the msg received */ unsigned KRB4_32 in_length; /* length of "in" msg */ Key_schedule schedule; /* precomputed key schedule */ - C_Block FAR *key; /* encryption key for seed and ivec */ + C_Block *key; /* encryption key for seed and ivec */ struct sockaddr_in *sender; struct sockaddr_in *receiver; MSG_DAT *m_data; /*various input/output data from msg */ diff --git a/src/lib/krb4/rd_req.c b/src/lib/krb4/rd_req.c index 2c8a24726..b97bdbe0a 100644 --- a/src/lib/krb4/rd_req.c +++ b/src/lib/krb4/rd_req.c @@ -165,11 +165,11 @@ krb_clear_key_krb5(ctx) int KRB5_CALLCONV krb_rd_req(authent, service, instance, from_addr, ad, fn) register KTEXT authent; /* The received message */ - char FAR *service; /* Service name */ - char FAR *instance; /* Service instance */ + char *service; /* Service name */ + char *instance; /* Service instance */ unsigned KRB4_32 from_addr; /* Net address of originating host */ - AUTH_DAT FAR *ad; /* Structure to be filled in */ - char FAR *fn; /* Filename to get keys from */ + AUTH_DAT *ad; /* Structure to be filled in */ + char *fn; /* Filename to get keys from */ { KTEXT_ST ticket; /* Temp storage for ticket */ KTEXT tkt = &ticket; diff --git a/src/lib/krb4/rd_safe.c b/src/lib/krb4/rd_safe.c index b0e955a11..40766ba52 100644 --- a/src/lib/krb4/rd_safe.c +++ b/src/lib/krb4/rd_safe.c @@ -64,12 +64,12 @@ extern int krb_debug; long KRB5_CALLCONV krb_rd_safe(in,in_length,key,sender,receiver,m_data) - u_char FAR *in; /* pointer to the msg received */ + u_char *in; /* pointer to the msg received */ unsigned KRB4_32 in_length; /* length of "in" msg */ - C_Block FAR *key; /* encryption key for seed and ivec */ - struct sockaddr_in FAR *sender; /* sender's address */ - struct sockaddr_in FAR *receiver; /* receiver's address -- me */ - MSG_DAT FAR *m_data; /* where to put message information */ + C_Block *key; /* encryption key for seed and ivec */ + struct sockaddr_in *sender; /* sender's address */ + struct sockaddr_in *receiver; /* receiver's address -- me */ + MSG_DAT *m_data; /* where to put message information */ { int i; unsigned KRB4_32 calc_cksum[4]; diff --git a/src/lib/krb4/rd_svc_key.c b/src/lib/krb4/rd_svc_key.c index b6188399b..c68c8e266 100644 --- a/src/lib/krb4/rd_svc_key.c +++ b/src/lib/krb4/rd_svc_key.c @@ -121,12 +121,12 @@ int vxworks_srvtab_read(fd, s, n) */ extern krb5_error_code krb54_get_service_keyblock(service,instance,realm,kvno,file,keyblock) - char FAR *service; /* Service Name */ - char FAR *instance; /* Instance name or "*" */ - char FAR *realm; /* Realm */ + char *service; /* Service Name */ + char *instance; /* Instance name or "*" */ + char *realm; /* Realm */ int kvno; /* Key version number */ - char FAR *file; /* Filename */ - krb5_keyblock FAR * keyblock; + char *file; /* Filename */ + krb5_keyblock * keyblock; { krb5_error_code retval; krb5_principal princ = NULL; @@ -212,12 +212,12 @@ errout: int KRB5_CALLCONV read_service_key(service,instance,realm,kvno,file,key) - char FAR *service; /* Service Name */ - char FAR *instance; /* Instance name or "*" */ - char FAR *realm; /* Realm */ + char *service; /* Service Name */ + char *instance; /* Instance name or "*" */ + char *realm; /* Realm */ int kvno; /* Key version number */ - char FAR *file; /* Filename */ - char FAR *key; /* Pointer to key to be filled in */ + char *file; /* Filename */ + char *key; /* Pointer to key to be filled in */ { int kret; @@ -263,12 +263,12 @@ errout: */ int KRB5_CALLCONV get_service_key(service,instance,realm,kvno,file,key) - char FAR *service; /* Service Name */ - char FAR *instance; /* Instance name or "*" */ - char FAR *realm; /* Realm */ - int FAR *kvno; /* Key version number */ - char FAR *file; /* Filename */ - char FAR *key; /* Pointer to key to be filled in */ + char *service; /* Service Name */ + char *instance; /* Instance name or "*" */ + char *realm; /* Realm */ + int *kvno; /* Key version number */ + char *file; /* Filename */ + char *key; /* Pointer to key to be filled in */ { char serv[SNAME_SZ]; char inst[INST_SZ]; diff --git a/src/lib/krb4/realmofhost.c b/src/lib/krb4/realmofhost.c index e419b56ea..d80770c09 100644 --- a/src/lib/krb4/realmofhost.c +++ b/src/lib/krb4/realmofhost.c @@ -43,9 +43,9 @@ extern char *malloc(); static char ret_realm[REALM_SZ+1]; -char FAR * KRB5_CALLCONV +char * KRB5_CALLCONV krb_realmofhost(host) - char FAR *host; + char *host; { char *domain; FILE *trans_file; diff --git a/src/lib/krb4/recvauth.c b/src/lib/krb4/recvauth.c index 41620f53d..5d6bb41bb 100644 --- a/src/lib/krb4/recvauth.c +++ b/src/lib/krb4/recvauth.c @@ -126,14 +126,14 @@ krb_recvauth(options, fd, ticket, service, instance, faddr, laddr, kdata, long options; /* bit-pattern of options */ int fd; /* file descr. to read from */ KTEXT ticket; /* storage for client's ticket */ - char FAR *service; /* service expected */ - char FAR *instance; /* inst expected (may be filled in) */ - struct sockaddr_in FAR *faddr; /* address of foreign host on fd */ - struct sockaddr_in FAR *laddr; /* local address */ - AUTH_DAT FAR *kdata; /* kerberos data (returned) */ - char FAR *filename; /* name of file with service keys */ + char *service; /* service expected */ + char *instance; /* inst expected (may be filled in) */ + struct sockaddr_in *faddr; /* address of foreign host on fd */ + struct sockaddr_in *laddr; /* local address */ + AUTH_DAT *kdata; /* kerberos data (returned) */ + char *filename; /* name of file with service keys */ Key_schedule schedule; /* key schedule (return) */ - char FAR *version; /* version string (filled in) */ + char *version; /* version string (filled in) */ { int i, cc, old_vers = 0; diff --git a/src/lib/krb4/save_creds.c b/src/lib/krb4/save_creds.c index fbd706bcf..67ec402f1 100644 --- a/src/lib/krb4/save_creds.c +++ b/src/lib/krb4/save_creds.c @@ -32,9 +32,9 @@ int KRB5_CALLCONV krb_save_credentials(service, instance, realm, session, lifetime, kvno, ticket, issue_date) - char FAR *service; /* Service name */ - char FAR *instance; /* Instance */ - char FAR *realm; /* Auth domain */ + char *service; /* Service name */ + char *instance; /* Instance */ + char *realm; /* Auth domain */ C_Block session; /* Session key */ int lifetime; /* Lifetime */ int kvno; /* Key version number */ diff --git a/src/lib/krb4/send_to_kdc.c b/src/lib/krb4/send_to_kdc.c index 8e6a19fad..47a954249 100644 --- a/src/lib/krb4/send_to_kdc.c +++ b/src/lib/krb4/send_to_kdc.c @@ -83,7 +83,7 @@ send_to_kdc(pkt,rpkt,realm) int n_hosts; int retval; struct sockaddr_in to; - struct hostent FAR *farkedhost; + struct hostent *farkedhost; struct hostent *host, *hostlist; char *cp; char krbhst[MAXHOSTNAMELEN]; @@ -114,7 +114,7 @@ send_to_kdc(pkt,rpkt,realm) /* The first time, decide what port to use for the KDC. */ if (cached_krb_udp_port == 0) { - register struct servent FAR *sp; + register struct servent *sp; sp = getservbyname("kerberos","udp"); if (sp) cached_krb_udp_port = sp->s_port; @@ -126,7 +126,7 @@ send_to_kdc(pkt,rpkt,realm) as a fallback. */ if (cached_krbsec_udp_port == 0 && cached_krb_udp_port != htons(KERBEROS_PORT)) { - register struct servent FAR *sp; + register struct servent *sp; sp = getservbyname("kerberos-sec","udp"); if (sp) cached_krbsec_udp_port = sp->s_port; diff --git a/src/lib/krb4/sendauth.c b/src/lib/krb4/sendauth.c index c44151cfd..691a4d11e 100644 --- a/src/lib/krb4/sendauth.c +++ b/src/lib/krb4/sendauth.c @@ -186,16 +186,16 @@ krb_sendauth(options, fd, ticket, service, inst, realm, checksum, int fd; /* file descriptor to write onto */ KTEXT ticket; /* where to put ticket (return); or supplied in case of KOPT_DONT_MK_REQ */ - char FAR *service; /* service name */ - char FAR *inst; /* service instance */ - char FAR *realm; /* service realm */ + char *service; /* service name */ + char *inst; /* service instance */ + char *realm; /* service realm */ unsigned KRB4_32 checksum; /* checksum to include in request */ MSG_DAT *msg_data; /* mutual auth MSG_DAT (return) */ CREDENTIALS *cred; /* credentials (return) */ Key_schedule schedule; /* key schedule (return) */ - struct sockaddr_in FAR *laddr; /* local address */ - struct sockaddr_in FAR *faddr; /* address of foreign host on fd */ - char FAR *version; /* version string */ + struct sockaddr_in *laddr; /* local address */ + struct sockaddr_in *faddr; /* address of foreign host on fd */ + char *version; /* version string */ { int rem, cc; char srv_inst[INST_SZ]; diff --git a/src/lib/krb4/unix_glue.c b/src/lib/krb4/unix_glue.c index a1120bb15..93a30ed01 100644 --- a/src/lib/krb4/unix_glue.c +++ b/src/lib/krb4/unix_glue.c @@ -26,7 +26,7 @@ krb_end_session (x) return KSUCCESS; } -char FAR * +char * krb_get_default_user () { return 0; /* FIXME */ diff --git a/src/lib/krb4/win_glue.c b/src/lib/krb4/win_glue.c index c22584656..9d85a1c3f 100644 --- a/src/lib/krb4/win_glue.c +++ b/src/lib/krb4/win_glue.c @@ -20,12 +20,12 @@ * but might be ordinary pointers on real machines. Printf modifiers * scattered through the code don't cut it, * since they might break on real machines. Microloss - * didn't provide a function to print a char FAR *, so we wrote one. + * didn't provide a function to print a char *, so we wrote one. * It gets #define'd to fputs on real machines. */ int far_fputs(string, stream) - char FAR *string; + char *string; FILE *stream; { return fprintf(stream, "%Fs", string); diff --git a/src/lib/krb4/win_store.c b/src/lib/krb4/win_store.c index 39841fcb6..46c135268 100644 --- a/src/lib/krb4/win_store.c +++ b/src/lib/krb4/win_store.c @@ -119,7 +119,7 @@ krb__get_realmsfile() * the [DEFAULTS] section of the "kerberos.ini" file located in the * Windows directory. */ -char FAR * KRB5_CALLCONV +char * KRB5_CALLCONV krb_get_default_user() { static char username[ANAME_SZ]; diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index 227c13cbc..2cbf9bd34 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,7 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * krb5_libinit.c: Drop _MSDOS support. + 2001-09-01 Ken Raeburn <raeburn@mit.edu> * Makefile.in (SRCS): Use $(srcdir) not $(subdir). diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index d76e2a774..227af04cb 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,10 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * cc_file.c, cc_stdio.c: Delete _MSDOS (win16) support. + + * cc_memory.c, ccbase.c, ccdefault.c, ccfns.c: Don't explicitly + declare pointers FAR any more. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> * cc_file.c, ccbase.c, cccopy.c, ccdefault.c, fcc.h, ser_cc.c: diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c index e389a481a..233430702 100644 --- a/src/lib/krb5/ccache/cc_file.c +++ b/src/lib/krb5/ccache/cc_file.c @@ -474,12 +474,8 @@ krb5_fcc_read_keyblock(context, id, keyblock) kret = krb5_fcc_read_int32(context, id, &int32); CHECK(kret); -#if defined(_MSDOS) - int32 &= VALID_INT_BITS; /* Gradient does not write correctly */ -#else if ((int32 & VALID_INT_BITS) != int32) /* Overflow size_t??? */ return KRB5_CC_NOMEM; -#endif keyblock->length = (int) int32; if ( keyblock->length == 0 ) return KRB5_OK; @@ -513,12 +509,8 @@ krb5_fcc_read_data(context, id, data) kret = krb5_fcc_read_int32(context, id, &len); CHECK(kret); -#if defined(_MSDOS) - len &= VALID_INT_BITS; -#else if ((len & VALID_INT_BITS) != len) return KRB5_CC_NOMEM; -#endif data->length = (int) len; if (data->length == 0) { @@ -560,12 +552,8 @@ krb5_fcc_read_addr(context, id, addr) kret = krb5_fcc_read_int32(context, id, &int32); CHECK(kret); -#if defined(_MSDOS) - int32 &= VALID_INT_BITS; /* Gradient DCE does this wrong */ -#else if ((int32 & VALID_INT_BITS) != int32) /* Overflow int??? */ return KRB5_CC_NOMEM; -#endif addr->length = (int) int32; if (addr->length == 0) @@ -743,12 +731,8 @@ krb5_fcc_read_authdatum(context, id, a) a->ad_type = (krb5_authdatatype)ui2; kret = krb5_fcc_read_int32(context, id, &int32); CHECK(kret); -#ifdef _MSDOS - int32 &= VALID_INT_BITS; -#else if ((int32 & VALID_INT_BITS) != int32) /* Overflow int??? */ return KRB5_CC_NOMEM; -#endif a->length = (int) int32; if (a->length == 0 ) @@ -2085,7 +2069,7 @@ krb5_cc_ops krb5_fcc_ops = { krb5_fcc_set_flags, }; -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) /* * krb5_change_cache should be called after the cache changes. @@ -2112,7 +2096,7 @@ krb5_get_notification_message (void) { return message; } -#else /* _MSDOS || _WIN32 */ +#else /* _WIN32 */ krb5_error_code krb5_change_cache () @@ -2125,7 +2109,7 @@ krb5_get_notification_message () return 0; } -#endif /* _MSDOS || _WIN32 */ +#endif /* _WIN32 */ krb5_cc_ops krb5_cc_file_ops = { 0, diff --git a/src/lib/krb5/ccache/cc_memory.c b/src/lib/krb5/ccache/cc_memory.c index 04b290aa9..9979a3b42 100644 --- a/src/lib/krb5/ccache/cc_memory.c +++ b/src/lib/krb5/ccache/cc_memory.c @@ -88,7 +88,7 @@ krb5_error_code krb5_change_cache PROTOTYPE(()); typedef struct _krb5_mcc_link { struct _krb5_mcc_link *next; krb5_creds *creds; -} krb5_mcc_link, FAR *krb5_mcc_cursor; +} krb5_mcc_link, *krb5_mcc_cursor; typedef struct _krb5_mcc_data { struct _krb5_mcc_data *next; @@ -97,7 +97,7 @@ typedef struct _krb5_mcc_data { krb5_mcc_cursor link; } krb5_mcc_data; -static krb5_mcc_data FAR *mcc_head = 0; +static krb5_mcc_data *mcc_head = 0; /* * Modifies: diff --git a/src/lib/krb5/ccache/cc_stdio.c b/src/lib/krb5/ccache/cc_stdio.c index f46e5d649..4b8291946 100644 --- a/src/lib/krb5/ccache/cc_stdio.c +++ b/src/lib/krb5/ccache/cc_stdio.c @@ -517,12 +517,8 @@ krb5_scc_read_keyblock(context, id, keyblock) kret = krb5_scc_read_int32(context, id, &int32); CHECK(kret); -#ifdef _MSDOS - int32 &= VALID_INT_BITS; /* Gradient does not write correctly */ -#else if ((int32 & VALID_INT_BITS) != int32) /* Overflow size_t??? */ return KRB5_CC_NOMEM; -#endif keyblock->length = int32; if ( keyblock->length == 0 ) return KRB5_OK; @@ -556,12 +552,8 @@ krb5_scc_read_data(context, id, data) kret = krb5_scc_read_int32(context, id, &len); CHECK(kret); -#ifdef _MSDOS - len &= VALID_INT_BITS; -#else if ((len & VALID_INT_BITS) != len) return KRB5_CC_NOMEM; -#endif data->length = (int) len; if (data->length == 0) { @@ -603,12 +595,8 @@ krb5_scc_read_addr(context, id, addr) kret = krb5_scc_read_int32(context, id, &int32); CHECK(kret); -#ifdef _MSDOS - int32 &= VALID_INT_BITS; /* Gradient DCE does this wrong */ -#else if ((int32 & VALID_INT_BITS) != int32) /* Overflow int??? */ return KRB5_CC_NOMEM; -#endif addr->length = int32; if (addr->length == 0) @@ -779,12 +767,8 @@ krb5_scc_read_authdatum(context, id, a) a->ad_type = (krb5_authdatatype)ui2; kret = krb5_scc_read_int32(context, id, &int32); CHECK(kret); -#ifdef _MSDOS - int32 &= VALID_INT_BITS; -#else if ((int32 & VALID_INT_BITS) != int32) /* Overflow int??? */ return KRB5_CC_NOMEM; -#endif a->length = int32; if (a->length == 0 ) @@ -1896,7 +1880,7 @@ krb5_scc_generate_new (context, id) strcpy(((krb5_scc_data *) lid->data)->filename, scratch); /* Make sure the file name is useable */ -#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32) +#if defined(__STDC__) || defined(_WIN32) f = fopen (((krb5_scc_data *) lid->data)->filename, "wb+"); #else f = fopen (((krb5_scc_data *) lid->data)->filename, "w+"); diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog index 24d04add1..973583a7f 100644 --- a/src/lib/krb5/ccache/ccapi/ChangeLog +++ b/src/lib/krb5/ccache/ccapi/ChangeLog @@ -1,3 +1,8 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * stdcc.c, stdcc.h, stdcc_util.c, stdcc_util.h, winccld.c: Delete + _MSDOS support. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> * stdcc.h, winccld.c: Don't use KRB5_DLLIMP. diff --git a/src/lib/krb5/ccache/ccapi/stdcc.c b/src/lib/krb5/ccache/ccapi/stdcc.c index b39dce9fe..9899cb706 100644 --- a/src/lib/krb5/ccache/ccapi/stdcc.c +++ b/src/lib/krb5/ccache/ccapi/stdcc.c @@ -36,7 +36,7 @@ apiCB *gCntrlBlock = NULL; -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) #include "winccld.h" #endif @@ -45,7 +45,7 @@ apiCB *gCntrlBlock = NULL; #endif #ifdef DEBUG -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) #include <io.h> #define SHOW_DEBUG(buf) MessageBox((HWND)NULL, (buf), "ccapi debug", MB_OK) #endif @@ -79,7 +79,7 @@ krb5_cc_ops krb5_cc_stdcc_ops = { krb5_stdcc_set_flags, }; -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) /* * cache_changed be called after the cache changes. * A notification message is is posted out to all top level @@ -96,13 +96,13 @@ void cache_changed() PostMessage(HWND_BROADCAST, message, 0, 0); } -#else /* _MSDOS || _WIN32 */ +#else /* _WIN32 */ void cache_changed() { return; } -#endif /* _MSDOS || _WIN32 */ +#endif /* _WIN32 */ struct err_xlate { diff --git a/src/lib/krb5/ccache/ccapi/stdcc.h b/src/lib/krb5/ccache/ccapi/stdcc.h index 7322c199e..e2d113168 100644 --- a/src/lib/krb5/ccache/ccapi/stdcc.h +++ b/src/lib/krb5/ccache/ccapi/stdcc.h @@ -5,7 +5,7 @@ #include "CCache2.h" #endif -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) #include "cacheapi.h" #endif diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.c b/src/lib/krb5/ccache/ccapi/stdcc_util.c index fb0150657..b9bc56ab4 100644 --- a/src/lib/krb5/ccache/ccapi/stdcc_util.c +++ b/src/lib/krb5/ccache/ccapi/stdcc_util.c @@ -8,7 +8,7 @@ #include <stdlib.h> #include <string.h> -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) #include <malloc.h> #endif diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.h b/src/lib/krb5/ccache/ccapi/stdcc_util.h index 7d3bc93f9..30d9cafd4 100644 --- a/src/lib/krb5/ccache/ccapi/stdcc_util.h +++ b/src/lib/krb5/ccache/ccapi/stdcc_util.h @@ -7,7 +7,7 @@ #include "CCache2.h" #endif -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) #include "cacheapi.h" #endif diff --git a/src/lib/krb5/ccache/ccapi/winccld.c b/src/lib/krb5/ccache/ccapi/winccld.c index 22489c10d..39d8f1227 100644 --- a/src/lib/krb5/ccache/ccapi/winccld.c +++ b/src/lib/krb5/ccache/ccapi/winccld.c @@ -1,4 +1,4 @@ -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) /* * winccld.c --- routine for dynamically loading the ccache DLL if * it's present. diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c index 18832e398..7c15d5070 100644 --- a/src/lib/krb5/ccache/ccbase.c +++ b/src/lib/krb5/ccache/ccbase.c @@ -48,7 +48,7 @@ static struct krb5_cc_typelist *cc_typehead = &cc_entry; krb5_error_code KRB5_CALLCONV krb5_cc_register(context, ops, override) krb5_context context; - krb5_cc_ops FAR *ops; + krb5_cc_ops *ops; krb5_boolean override; { struct krb5_cc_typelist *t; diff --git a/src/lib/krb5/ccache/ccdefault.c b/src/lib/krb5/ccache/ccdefault.c index 2c4eea9f5..7fde85286 100644 --- a/src/lib/krb5/ccache/ccdefault.c +++ b/src/lib/krb5/ccache/ccdefault.c @@ -36,7 +36,7 @@ krb5_error_code KRB5_CALLCONV krb5_cc_default(context, ccache) krb5_context context; - krb5_ccache FAR *ccache; + krb5_ccache *ccache; { krb5_error_code retval; krb5_os_context os_ctx; @@ -65,7 +65,7 @@ krb5_cc_default(context, ccache) krb5_error_code KRB5_CALLCONV krb5int_cc_default(context, ccache) krb5_context context; - krb5_ccache FAR *ccache; + krb5_ccache *ccache; { #ifdef USE_LOGIN_LIBRARY { diff --git a/src/lib/krb5/ccache/ccfns.c b/src/lib/krb5/ccache/ccfns.c index 35a17367e..a8715b402 100644 --- a/src/lib/krb5/ccache/ccfns.c +++ b/src/lib/krb5/ccache/ccfns.c @@ -30,14 +30,14 @@ #include "k5-int.h" -const char FAR * KRB5_CALLCONV +const char * KRB5_CALLCONV krb5_cc_get_name (krb5_context context, krb5_ccache cache) { return cache->ops->get_name(context, cache); } krb5_error_code KRB5_CALLCONV -krb5_cc_gen_new (krb5_context context, krb5_ccache FAR *cache) +krb5_cc_gen_new (krb5_context context, krb5_ccache *cache) { return (*cache)->ops->gen_new(context, cache); } @@ -63,50 +63,50 @@ krb5_cc_close (krb5_context context, krb5_ccache cache) krb5_error_code KRB5_CALLCONV krb5_cc_store_cred (krb5_context context, krb5_ccache cache, - krb5_creds FAR *creds) + krb5_creds *creds) { return cache->ops->store(context, cache, creds); } krb5_error_code KRB5_CALLCONV krb5_cc_retrieve_cred (krb5_context context, krb5_ccache cache, - krb5_flags flags, krb5_creds FAR *mcreds, - krb5_creds FAR *creds) + krb5_flags flags, krb5_creds *mcreds, + krb5_creds *creds) { return cache->ops->retrieve(context, cache, flags, mcreds, creds); } krb5_error_code KRB5_CALLCONV krb5_cc_get_principal (krb5_context context, krb5_ccache cache, - krb5_principal FAR *principal) + krb5_principal *principal) { return cache->ops->get_princ(context, cache, principal); } krb5_error_code KRB5_CALLCONV krb5_cc_start_seq_get (krb5_context context, krb5_ccache cache, - krb5_cc_cursor FAR *cursor) + krb5_cc_cursor *cursor) { return cache->ops->get_first(context, cache, cursor); } krb5_error_code KRB5_CALLCONV krb5_cc_next_cred (krb5_context context, krb5_ccache cache, - krb5_cc_cursor FAR *cursor, krb5_creds FAR *creds) + krb5_cc_cursor *cursor, krb5_creds *creds) { return cache->ops->get_next(context, cache, cursor, creds); } krb5_error_code KRB5_CALLCONV krb5_cc_end_seq_get (krb5_context context, krb5_ccache cache, - krb5_cc_cursor FAR *cursor) + krb5_cc_cursor *cursor) { return cache->ops->end_get(context, cache, cursor); } krb5_error_code KRB5_CALLCONV krb5_cc_remove_cred (krb5_context context, krb5_ccache cache, krb5_flags flags, - krb5_creds FAR *creds) + krb5_creds *creds) { return cache->ops->remove_cred(context, cache, flags, creds); } @@ -117,7 +117,7 @@ krb5_cc_set_flags (krb5_context context, krb5_ccache cache, krb5_flags flags) return cache->ops->set_flags(context, cache, flags); } -const char FAR * KRB5_CALLCONV +const char * KRB5_CALLCONV krb5_cc_get_type (krb5_context context, krb5_ccache cache) { return cache->ops->prefix; diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index e1d8327fb..ad3cbb7de 100644 --- a/src/lib/krb5/keytab/ChangeLog +++ b/src/lib/krb5/keytab/ChangeLog @@ -1,7 +1,8 @@ 2001-10-03 Ken Raeburn <raeburn@mit.edu> * ktadd.c, ktbase.c, ktdefault.c, ktfr_entry.c, ktremove.c, - read_servi.c: Don't use KRB5_DLLIMP. + read_servi.c: Don't use KRB5_DLLIMP. Don't explicitly declare + pointers FAR any more. 2000-10-17 Ezra Peisach <epeisach@mit.edu> diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog index c1e910a93..e23c9b11d 100644 --- a/src/lib/krb5/keytab/file/ChangeLog +++ b/src/lib/krb5/keytab/file/ChangeLog @@ -1,3 +1,7 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * ser_ktf.c: Drop _MSDOS support. + 2000-10-17 Ezra Peisach <epeisach@mit.edu> * ktf_util.c: Unsigned/signed int cleanups. diff --git a/src/lib/krb5/keytab/file/ser_ktf.c b/src/lib/krb5/keytab/file/ser_ktf.c index af4189617..ca54f93b6 100644 --- a/src/lib/krb5/keytab/file/ser_ktf.c +++ b/src/lib/krb5/keytab/file/ser_ktf.c @@ -166,7 +166,7 @@ krb5_ktf_keytab_externalize(kcontext, arg, buffer, lenremain) int fflags = 0; file_is_open = 1; -#if !defined( macintosh) && !defined(_MSDOS) && !defined(_WIN32) +#if !defined( macintosh) && !defined(_WIN32) fflags = fcntl(fileno(ktdata->openf), F_GETFL, 0); if (fflags > 0) file_is_open |= ((fflags & O_ACCMODE) << 1); @@ -285,7 +285,7 @@ krb5_ktf_keytab_internalize(kcontext, argp, buffer, lenremain) int fmode; long fpos; -#if !defined( macintosh) && !defined(_MSDOS) && !defined(_WIN32) +#if !defined( macintosh) && !defined(_WIN32) fmode = (file_is_open >> 1) & O_ACCMODE; #else fmode = 0; diff --git a/src/lib/krb5/keytab/ktadd.c b/src/lib/krb5/keytab/ktadd.c index ba9e9fc3b..6f1fc0c02 100644 --- a/src/lib/krb5/keytab/ktadd.c +++ b/src/lib/krb5/keytab/ktadd.c @@ -33,7 +33,7 @@ krb5_error_code KRB5_CALLCONV krb5_kt_add_entry (context, id, entry) krb5_context context; krb5_keytab id; - krb5_keytab_entry FAR *entry; + krb5_keytab_entry *entry; { if (id->ops->add) return (*id->ops->add)(context, id, entry); diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c index bdac5622e..b808ec42b 100644 --- a/src/lib/krb5/keytab/ktbase.c +++ b/src/lib/krb5/keytab/ktbase.c @@ -55,7 +55,7 @@ static struct krb5_kt_typelist *kt_typehead = &krb5_kt_typelist_srvtab; krb5_error_code KRB5_CALLCONV krb5_kt_register(context, ops) krb5_context context; - krb5_kt_ops FAR *ops; + krb5_kt_ops *ops; { struct krb5_kt_typelist *t; for (t = kt_typehead;t && strcmp(t->ops->prefix,ops->prefix);t = t->next) @@ -84,8 +84,8 @@ krb5_kt_register(context, ops) krb5_error_code KRB5_CALLCONV krb5_kt_resolve (context, name, ktid) krb5_context context; - krb5_const char FAR *name; - krb5_keytab FAR *ktid; + krb5_const char *name; + krb5_keytab *ktid; { struct krb5_kt_typelist *tlist; char *pfx; diff --git a/src/lib/krb5/keytab/ktdefault.c b/src/lib/krb5/keytab/ktdefault.c index 90f03dc85..51ab8745c 100644 --- a/src/lib/krb5/keytab/ktdefault.c +++ b/src/lib/krb5/keytab/ktdefault.c @@ -33,7 +33,7 @@ krb5_error_code KRB5_CALLCONV krb5_kt_default(context, id) krb5_context context; - krb5_keytab FAR *id; + krb5_keytab *id; { char defname[BUFSIZ]; krb5_error_code retval; diff --git a/src/lib/krb5/keytab/ktfr_entry.c b/src/lib/krb5/keytab/ktfr_entry.c index 3582193a3..b985e805a 100644 --- a/src/lib/krb5/keytab/ktfr_entry.c +++ b/src/lib/krb5/keytab/ktfr_entry.c @@ -32,7 +32,7 @@ krb5_error_code KRB5_CALLCONV krb5_kt_free_entry (context, entry) krb5_context context; - krb5_keytab_entry FAR *entry; + krb5_keytab_entry *entry; { if (!entry) return 0; diff --git a/src/lib/krb5/keytab/ktremove.c b/src/lib/krb5/keytab/ktremove.c index abb37059b..d9599e3d5 100644 --- a/src/lib/krb5/keytab/ktremove.c +++ b/src/lib/krb5/keytab/ktremove.c @@ -33,7 +33,7 @@ krb5_error_code KRB5_CALLCONV krb5_kt_remove_entry (context, id, entry) krb5_context context; krb5_keytab id; - krb5_keytab_entry FAR *entry; + krb5_keytab_entry *entry; { if (id->ops->remove) return (*id->ops->remove)(context, id, entry); diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c index 10a3964fe..141184c37 100644 --- a/src/lib/krb5/keytab/read_servi.c +++ b/src/lib/krb5/keytab/read_servi.c @@ -50,7 +50,7 @@ krb5_kt_read_service_key(context, keyprocarg, principal, vno, enctype, key) krb5_principal principal; krb5_kvno vno; krb5_enctype enctype; - krb5_keyblock FAR * FAR * key; + krb5_keyblock ** key; { krb5_error_code kerror = KSUCCESS; char keytabname[MAX_KEYTAB_NAME_LEN + 1]; /* + 1 for NULL termination */ diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 1c73fa4df..65d9b6e69 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,17 +1,21 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * init_ctx.c, preauth.c: Drop _MSDOS support. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> - * appdefault.c, auth_con.c, kld_pr_ext.c, bld_princ.c, chpw.c, + * appdefault.c, auth_con.c, bld_pr_ext.c, bld_princ.c, chpw.c, conv_princ.c, copy_addrs.c, copy_athctr.c, copy_auth.c, copy_cksum.c, copy_creds.c, copy_data.c, copy_key.c, copy_princ.c, - copy_tick.c, cp_key_cnt.c, decrypt_tk.c, deltat.c, fwd_tgt.c, - get_creds.c, get_in_tkt.c, gic_keytab.c, gic_opt.c, gic_pwd.c, - in_tkt_ktb.c, in_tkt_pwd.c, in_tkt_sky.c, init_ctx.c, kfree.c, - mk_cred.c, mk_error.c, mk_priv.c, mk_rep.c, mk_req.c, - mk_req_ext.c, mk_safe.c, parse.c, princ_comp.c, rd_cred.c, - rd_error.c, rd_priv.c, rd_rep.c, rd_req.c, rd_safe.c, recvauth.c, - sendauth.c, ser_actx.c, ser_ctx.c, serialize.c, set_realm.c, - srv_rcache.c, str_conv.c, unparse.c, vfy_increds.c, vic_opt.c, - x-deltat.y: Don't use KRB5_DLLIMP. + copy_tick.c, cp_key_cnt.c, decrypt_tk.c, fwd_tgt.c, get_creds.c, + get_in_tkt.c, gic_keytab.c, gic_opt.c, gic_pwd.c, in_tkt_ktb.c, + in_tkt_pwd.c, in_tkt_sky.c, init_ctx.c, kfree.c, mk_cred.c, + mk_error.c, mk_priv.c, mk_rep.c, mk_req.c, mk_req_ext.c, + mk_safe.c, parse.c, princ_comp.c, rd_cred.c, rd_error.c, + rd_priv.c, rd_rep.c, rd_req.c, rd_safe.c, recvauth.c, sendauth.c, + ser_actx.c, ser_ctx.c, serialize.c, set_realm.c, srv_rcache.c, + str_conv.c, unparse.c, vfy_increds.c, vic_opt.c, x-deltat.y: Don't + use KRB5_DLLIMP. Don't explicitly declare pointers FAR any more. 2001-09-07 Ken Raeburn <raeburn@mit.edu> diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c index 14f91e4a0..ac41ef3dc 100644 --- a/src/lib/krb5/krb/auth_con.c +++ b/src/lib/krb5/krb/auth_con.c @@ -28,7 +28,7 @@ actx_copy_addr(context, inad, outad) krb5_error_code KRB5_CALLCONV krb5_auth_con_init(context, auth_context) krb5_context context; - krb5_auth_context FAR * auth_context; + krb5_auth_context * auth_context; { *auth_context = (krb5_auth_context)malloc(sizeof(struct _krb5_auth_context)); @@ -177,7 +177,7 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_setuseruserkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context auth_context; - krb5_keyblock FAR * keyblock; + krb5_keyblock * keyblock; { if (auth_context->keyblock) krb5_free_keyblock(context, auth_context->keyblock); @@ -200,7 +200,7 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_getlocalsubkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context auth_context; - krb5_keyblock FAR * FAR * keyblock; + krb5_keyblock ** keyblock; { if (auth_context->local_subkey) return krb5_copy_keyblock(context,auth_context->local_subkey,keyblock); @@ -212,7 +212,7 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_getremotesubkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context auth_context; - krb5_keyblock FAR * FAR * keyblock; + krb5_keyblock ** keyblock; { if (auth_context->remote_subkey) return krb5_copy_keyblock(context,auth_context->remote_subkey,keyblock); @@ -254,7 +254,7 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_getauthenticator(context, auth_context, authenticator) krb5_context context; krb5_auth_context auth_context; - krb5_authenticator FAR * FAR * authenticator; + krb5_authenticator ** authenticator; { return (krb5_copy_authenticator(context, auth_context->authentp, authenticator)); @@ -264,7 +264,7 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber) krb5_context context; krb5_auth_context auth_context; - krb5_int32 FAR * seqnumber; + krb5_int32 * seqnumber; { *seqnumber = auth_context->remote_seq_number; return 0; @@ -326,7 +326,7 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_getflags(context, auth_context, flags) krb5_context context; krb5_auth_context auth_context; - krb5_int32 FAR * flags; + krb5_int32 * flags; { *flags = auth_context->auth_context_flags; return 0; diff --git a/src/lib/krb5/krb/bld_pr_ext.c b/src/lib/krb5/krb/bld_pr_ext.c index 9ce0459f1..cc4d6b85d 100644 --- a/src/lib/krb5/krb/bld_pr_ext.c +++ b/src/lib/krb5/krb/bld_pr_ext.c @@ -37,13 +37,13 @@ krb5_error_code KRB5_CALLCONV_C #ifdef HAVE_STDARG_H -krb5_build_principal_ext(krb5_context context, krb5_principal FAR * princ, unsigned int rlen, krb5_const char FAR * realm, ...) +krb5_build_principal_ext(krb5_context context, krb5_principal * princ, unsigned int rlen, krb5_const char * realm, ...) #else krb5_build_principal_ext(context, princ, rlen, realm, va_alist) krb5_context context; - krb5_principal FAR *princ; + krb5_principal *princ; unsigned int rlen; - krb5_const char FAR *realm; + krb5_const char *realm; va_dcl #endif { diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c index 335543980..0e3cd23f0 100644 --- a/src/lib/krb5/krb/bld_princ.c +++ b/src/lib/krb5/krb/bld_princ.c @@ -103,13 +103,13 @@ krb5_error_code KRB5_CALLCONV_C #ifdef HAVE_STDARG_H krb5_build_principal(krb5_context context, krb5_principal * princ, unsigned int rlen, - krb5_const char FAR * realm, ...) + krb5_const char * realm, ...) #else krb5_build_principal(context, princ, rlen, realm, va_alist) krb5_context context; krb5_principal *princ; unsigned int rlen; - krb5_const char FAR *realm; + krb5_const char *realm; va_dcl #endif { diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c index 4239c353d..5c1853c4a 100644 --- a/src/lib/krb5/krb/conv_princ.c +++ b/src/lib/krb5/krb/conv_princ.c @@ -131,9 +131,9 @@ krb5_error_code KRB5_CALLCONV krb5_524_conv_principal(context, princ, name, inst, realm) krb5_context context; const krb5_principal princ; - char FAR *name; - char FAR *inst; - char FAR *realm; + char *name; + char *inst; + char *realm; { const struct krb_convert *p; krb5_data *compo; @@ -232,10 +232,10 @@ krb5_524_conv_principal(context, princ, name, inst, realm) krb5_error_code KRB5_CALLCONV krb5_425_conv_principal(context, name, instance, realm, princ) krb5_context context; - const char FAR *name; - const char FAR *instance; - const char FAR *realm; - krb5_principal FAR *princ; + const char *name; + const char *instance; + const char *realm; + krb5_principal *princ; { const struct krb_convert *p; char buf[256]; /* V4 instances are limited to 40 characters */ diff --git a/src/lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c index 5310351f4..667da476c 100644 --- a/src/lib/krb5/krb/copy_addrs.c +++ b/src/lib/krb5/krb/copy_addrs.c @@ -32,12 +32,12 @@ krb5_error_code KRB5_CALLCONV krb5_copy_addr(context, inad, outad) krb5_context context; - const krb5_address FAR *inad; - krb5_address FAR * FAR *outad; + const krb5_address *inad; + krb5_address **outad; { - krb5_address FAR *tmpad; + krb5_address *tmpad; - if (!(tmpad = (krb5_address FAR *)malloc(sizeof(*tmpad)))) + if (!(tmpad = (krb5_address *)malloc(sizeof(*tmpad)))) return ENOMEM; #ifdef HAVE_C_STRUCTURE_ASSIGNMENT *tmpad = *inad; @@ -59,8 +59,8 @@ krb5_copy_addr(context, inad, outad) krb5_error_code KRB5_CALLCONV krb5_copy_addresses(context, inaddr, outaddr) krb5_context context; - krb5_address FAR * const FAR * inaddr; - krb5_address FAR * FAR * FAR *outaddr; + krb5_address * const * inaddr; + krb5_address ***outaddr; { krb5_error_code retval; krb5_address ** tempaddr; diff --git a/src/lib/krb5/krb/copy_athctr.c b/src/lib/krb5/krb/copy_athctr.c index 62c5af3ef..e421d903f 100644 --- a/src/lib/krb5/krb/copy_athctr.c +++ b/src/lib/krb5/krb/copy_athctr.c @@ -32,8 +32,8 @@ krb5_error_code KRB5_CALLCONV krb5_copy_authenticator(context, authfrom, authto) krb5_context context; - const krb5_authenticator FAR *authfrom; - krb5_authenticator FAR *FAR *authto; + const krb5_authenticator *authfrom; + krb5_authenticator **authto; { krb5_error_code retval; krb5_authenticator *tempto; diff --git a/src/lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c index f0aba10dd..cd4abccaa 100644 --- a/src/lib/krb5/krb/copy_auth.c +++ b/src/lib/krb5/krb/copy_auth.c @@ -59,8 +59,8 @@ krb5_authdata **outad; krb5_error_code KRB5_CALLCONV krb5_copy_authdata(context, inauthdat, outauthdat) krb5_context context; - krb5_authdata FAR * const FAR * inauthdat; - krb5_authdata FAR * FAR * FAR *outauthdat; + krb5_authdata * const * inauthdat; + krb5_authdata ***outauthdat; { krb5_error_code retval; krb5_authdata ** tempauthdat; diff --git a/src/lib/krb5/krb/copy_cksum.c b/src/lib/krb5/krb/copy_cksum.c index 971000f8f..0507c27b9 100644 --- a/src/lib/krb5/krb/copy_cksum.c +++ b/src/lib/krb5/krb/copy_cksum.c @@ -32,8 +32,8 @@ krb5_error_code KRB5_CALLCONV krb5_copy_checksum(context, ckfrom, ckto) krb5_context context; - const krb5_checksum FAR *ckfrom; - krb5_checksum FAR * FAR *ckto; + const krb5_checksum *ckfrom; + krb5_checksum **ckto; { krb5_checksum *tempto; diff --git a/src/lib/krb5/krb/copy_data.c b/src/lib/krb5/krb/copy_data.c index 2a21488e5..a8b227908 100644 --- a/src/lib/krb5/krb/copy_data.c +++ b/src/lib/krb5/krb/copy_data.c @@ -35,8 +35,8 @@ krb5_error_code KRB5_CALLCONV krb5_copy_data(context, indata, outdata) krb5_context context; - const krb5_data FAR *indata; - krb5_data FAR * FAR *outdata; + const krb5_data *indata; + krb5_data **outdata; { krb5_data *tempdata; diff --git a/src/lib/krb5/krb/copy_key.c b/src/lib/krb5/krb/copy_key.c index 96d889676..9a5fa13e8 100644 --- a/src/lib/krb5/krb/copy_key.c +++ b/src/lib/krb5/krb/copy_key.c @@ -35,8 +35,8 @@ krb5_error_code KRB5_CALLCONV krb5_copy_keyblock(context, from, to) krb5_context context; - const krb5_keyblock FAR *from; - krb5_keyblock FAR * FAR *to; + const krb5_keyblock *from; + krb5_keyblock **to; { krb5_keyblock *new_key; diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c index 6051ecb3d..d85bedc3c 100644 --- a/src/lib/krb5/krb/copy_princ.c +++ b/src/lib/krb5/krb/copy_princ.c @@ -36,7 +36,7 @@ krb5_error_code KRB5_CALLCONV krb5_copy_principal(context, inprinc, outprinc) krb5_context context; krb5_const_principal inprinc; - krb5_principal FAR *outprinc; + krb5_principal *outprinc; { register krb5_principal tempprinc; register int i, nelems; diff --git a/src/lib/krb5/krb/cp_key_cnt.c b/src/lib/krb5/krb/cp_key_cnt.c index 0934b124c..d83d07a26 100644 --- a/src/lib/krb5/krb/cp_key_cnt.c +++ b/src/lib/krb5/krb/cp_key_cnt.c @@ -35,8 +35,8 @@ krb5_error_code KRB5_CALLCONV krb5_copy_keyblock_contents(context, from, to) krb5_context context; - const krb5_keyblock FAR *from; - krb5_keyblock FAR *to; + const krb5_keyblock *from; + krb5_keyblock *to; { *to = *from; to->contents = (krb5_octet *)malloc(to->length); diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c index 7fcf618a8..c8b35d442 100644 --- a/src/lib/krb5/krb/decrypt_tk.c +++ b/src/lib/krb5/krb/decrypt_tk.c @@ -41,8 +41,8 @@ krb5_error_code KRB5_CALLCONV krb5_decrypt_tkt_part(context, srv_key, ticket) krb5_context context; - const krb5_keyblock FAR *srv_key; - register krb5_ticket FAR *ticket; + const krb5_keyblock *srv_key; + register krb5_ticket *ticket; { krb5_enc_tkt_part *dec_tkt_part; krb5_data scratch; diff --git a/src/lib/krb5/krb/deltat.c b/src/lib/krb5/krb/deltat.c index 057c1367e..c71909a02 100644 --- a/src/lib/krb5/krb/deltat.c +++ b/src/lib/krb5/krb/deltat.c @@ -1,6 +1,7 @@ /* A Bison parser, made from ../../../../src/lib/krb5/krb/x-deltat.y - by GNU Bison version 1.28 */ + by GNU Bison version 1.27 + */ #define YYBISON 1 /* Identify Bison output. */ @@ -233,8 +234,8 @@ static const short yycheck[] = { 0, #define YYPURE 1 /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/tmp/bison/share/bison.simple" -/* This file comes from bison-1.28. */ +#line 3 "/mit/gnu/share/bison.simple" +/* This file comes from bison-1.27. */ /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -447,7 +448,7 @@ __yy_memcpy (char *to, char *from, unsigned int count) #endif #endif -#line 217 "/tmp/bison/share/bison.simple" +#line 216 "/mit/gnu/share/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -831,7 +832,7 @@ case 21: break;} } /* the action file gets copied in in place of this dollarsign */ -#line 543 "/tmp/bison/share/bison.simple" +#line 542 "/mit/gnu/share/bison.simple" yyvsp -= yylen; yyssp -= yylen; @@ -1108,8 +1109,8 @@ mylex (krb5_int32 *intp, char **pp) krb5_error_code KRB5_CALLCONV krb5_string_to_deltat(string, deltatp) - char FAR * string; - krb5_deltat FAR * deltatp; + char * string; + krb5_deltat * deltatp; { struct param p; p.delta = 0; diff --git a/src/lib/krb5/krb/fwd_tgt.c b/src/lib/krb5/krb/fwd_tgt.c index 22f240835..9dd9e116b 100644 --- a/src/lib/krb5/krb/fwd_tgt.c +++ b/src/lib/krb5/krb/fwd_tgt.c @@ -39,19 +39,19 @@ krb5_fwd_tgt_creds(context, auth_context, rhost, client, server, cc, forwardable, outbuf) krb5_context context; krb5_auth_context auth_context; - char FAR *rhost; + char *rhost; krb5_principal client; krb5_principal server; krb5_ccache cc; int forwardable; /* Should forwarded TGT also be forwardable? */ - krb5_data FAR *outbuf; + krb5_data *outbuf; { krb5_replay_data replaydata; - krb5_data FAR * scratch = 0; - krb5_address FAR * FAR *addrs = 0; + krb5_data * scratch = 0; + krb5_address **addrs = 0; krb5_error_code retval; krb5_creds creds, tgt; - krb5_creds FAR *pcreds; + krb5_creds *pcreds; krb5_flags kdcoptions; int close_cc = 0; int free_rhost = 0; diff --git a/src/lib/krb5/krb/get_creds.c b/src/lib/krb5/krb/get_creds.c index b3b89d109..0455be4db 100644 --- a/src/lib/krb5/krb/get_creds.c +++ b/src/lib/krb5/krb/get_creds.c @@ -105,8 +105,8 @@ krb5_get_credentials(context, options, ccache, in_creds, out_creds) krb5_context context; const krb5_flags options; krb5_ccache ccache; - krb5_creds FAR *in_creds; - krb5_creds FAR * FAR *out_creds; + krb5_creds *in_creds; + krb5_creds **out_creds; { krb5_error_code retval; krb5_creds mcreds; diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 04bc511b3..0a8f690ee 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -411,16 +411,16 @@ krb5_get_in_tkt(context, options, addrs, ktypes, ptypes, key_proc, keyseed, decrypt_proc, decryptarg, creds, ccache, ret_as_reply) krb5_context context; const krb5_flags options; - krb5_address FAR * const FAR * addrs; - krb5_enctype FAR * ktypes; - krb5_preauthtype FAR * ptypes; + krb5_address * const * addrs; + krb5_enctype * ktypes; + krb5_preauthtype * ptypes; git_key_proc key_proc; krb5_const_pointer keyseed; git_decrypt_proc decrypt_proc; krb5_const_pointer decryptarg; - krb5_creds FAR * creds; + krb5_creds * creds; krb5_ccache ccache; - krb5_kdc_rep FAR * FAR * ret_as_reply; + krb5_kdc_rep ** ret_as_reply; { krb5_error_code retval; krb5_timestamp time_now; diff --git a/src/lib/krb5/krb/in_tkt_ktb.c b/src/lib/krb5/krb/in_tkt_ktb.c index f6678bbf5..cb9c41e1a 100644 --- a/src/lib/krb5/krb/in_tkt_ktb.c +++ b/src/lib/krb5/krb/in_tkt_ktb.c @@ -114,13 +114,13 @@ krb5_get_in_tkt_with_keytab(context, options, addrs, ktypes, pre_auth_types, keytab, ccache, creds, ret_as_reply) krb5_context context; const krb5_flags options; - krb5_address FAR * const FAR * addrs; - krb5_enctype FAR * ktypes; - krb5_preauthtype FAR * pre_auth_types; + krb5_address * const * addrs; + krb5_enctype * ktypes; + krb5_preauthtype * pre_auth_types; const krb5_keytab keytab; krb5_ccache ccache; - krb5_creds FAR * creds; - krb5_kdc_rep FAR *FAR * ret_as_reply; + krb5_creds * creds; + krb5_kdc_rep ** ret_as_reply; { struct keytab_keyproc_arg arg; diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c index 4773c297b..b494f1194 100644 --- a/src/lib/krb5/krb/in_tkt_pwd.c +++ b/src/lib/krb5/krb/in_tkt_pwd.c @@ -100,13 +100,13 @@ krb5_get_in_tkt_with_password(context, options, addrs, ktypes, pre_auth_types, password, ccache, creds, ret_as_reply) krb5_context context; const krb5_flags options; - krb5_address FAR * const FAR * addrs; - krb5_enctype FAR * ktypes; - krb5_preauthtype FAR * pre_auth_types; - const char FAR * password; + krb5_address * const * addrs; + krb5_enctype * ktypes; + krb5_preauthtype * pre_auth_types; + const char * password; krb5_ccache ccache; - krb5_creds FAR * creds; - krb5_kdc_rep FAR * FAR * ret_as_reply; + krb5_creds * creds; + krb5_kdc_rep ** ret_as_reply; { krb5_error_code retval; krb5_data data; diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c index 754b8ce71..0ca1e7ef2 100644 --- a/src/lib/krb5/krb/in_tkt_sky.c +++ b/src/lib/krb5/krb/in_tkt_sky.c @@ -102,13 +102,13 @@ krb5_get_in_tkt_with_skey(context, options, addrs, ktypes, pre_auth_types, key, ccache, creds, ret_as_reply) krb5_context context; const krb5_flags options; - krb5_address FAR * const FAR * addrs; - krb5_enctype FAR * ktypes; - krb5_preauthtype FAR * pre_auth_types; - const krb5_keyblock FAR * key; + krb5_address * const * addrs; + krb5_enctype * ktypes; + krb5_preauthtype * pre_auth_types; + const krb5_keyblock * key; krb5_ccache ccache; - krb5_creds FAR * creds; - krb5_kdc_rep FAR * FAR * ret_as_reply; + krb5_creds * creds; + krb5_kdc_rep ** ret_as_reply; { if (key) diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index 5f8c03f49..7fb025ff5 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -68,7 +68,7 @@ "des3-cbc-sha1 " \ "des-cbc-crc des-cbc-md5 des-cbc-md4 " -#if (defined(_MSDOS) || defined(_WIN32)) +#if (defined(_WIN32)) extern krb5_error_code krb5_vercheck(); extern void krb5_win_ccdll_load(krb5_context context); #endif @@ -110,7 +110,7 @@ init_common (context, secure) /* Initialize error tables */ krb5_init_ets(ctx); -#if (defined(_MSDOS) || defined(_WIN32)) +#if (defined(_WIN32)) /* * Load the krbcc32.dll if necessary. We do this here so that * we know to use API: later on during initialization. @@ -299,7 +299,7 @@ get_profile_etype_list(context, ktypes, profstr, ctx_count, ctx_list) krb5_enctype **ktypes; char *profstr; int ctx_count; - krb5_enctype FAR *ctx_list; + krb5_enctype *ctx_list; { krb5_enctype *old_ktypes; @@ -424,7 +424,7 @@ void KRB5_CALLCONV krb5_free_ktypes (context, val) krb5_context context; - krb5_enctype FAR *val; + krb5_enctype *val; { free (val); } diff --git a/src/lib/krb5/krb/kfree.c b/src/lib/krb5/krb/kfree.c index a87ac7b17..da7d294db 100644 --- a/src/lib/krb5/krb/kfree.c +++ b/src/lib/krb5/krb/kfree.c @@ -31,7 +31,7 @@ void KRB5_CALLCONV krb5_free_address(context, val) krb5_context context; - krb5_address FAR *val; + krb5_address *val; { if (val->contents) krb5_xfree(val->contents); @@ -41,7 +41,7 @@ krb5_free_address(context, val) void KRB5_CALLCONV krb5_free_addresses(context, val) krb5_context context; - krb5_address FAR * FAR *val; + krb5_address **val; { register krb5_address **temp; @@ -57,7 +57,7 @@ krb5_free_addresses(context, val) void KRB5_CALLCONV krb5_free_ap_rep(context, val) krb5_context context; - register krb5_ap_rep FAR *val; + register krb5_ap_rep *val; { if (val->enc_part.ciphertext.data) krb5_xfree(val->enc_part.ciphertext.data); @@ -67,7 +67,7 @@ krb5_free_ap_rep(context, val) void KRB5_CALLCONV krb5_free_ap_req(context, val) krb5_context context; - register krb5_ap_req FAR *val; + register krb5_ap_req *val; { if (val->ticket) krb5_free_ticket(context, val->ticket); @@ -79,7 +79,7 @@ krb5_free_ap_req(context, val) void KRB5_CALLCONV krb5_free_ap_rep_enc_part(context, val) krb5_context context; - krb5_ap_rep_enc_part FAR *val; + krb5_ap_rep_enc_part *val; { if (val->subkey) krb5_free_keyblock(context, val->subkey); @@ -89,7 +89,7 @@ krb5_free_ap_rep_enc_part(context, val) void KRB5_CALLCONV krb5_free_authenticator_contents(context, val) krb5_context context; - krb5_authenticator FAR *val; + krb5_authenticator *val; { if (val->checksum) { krb5_free_checksum(context, val->checksum); @@ -112,7 +112,7 @@ krb5_free_authenticator_contents(context, val) void KRB5_CALLCONV krb5_free_authdata(context, val) krb5_context context; - krb5_authdata FAR * FAR *val; + krb5_authdata **val; { register krb5_authdata **temp; @@ -127,7 +127,7 @@ krb5_free_authdata(context, val) void KRB5_CALLCONV krb5_free_authenticator(context, val) krb5_context context; - krb5_authenticator FAR *val; + krb5_authenticator *val; { krb5_free_authenticator_contents(context, val); krb5_xfree(val); @@ -156,7 +156,7 @@ krb5_free_checksum_contents(context, val) void KRB5_CALLCONV krb5_free_cred(context, val) krb5_context context; - register krb5_cred FAR *val; + register krb5_cred *val; { if (val->tickets) krb5_free_tickets(context, val->tickets); @@ -173,7 +173,7 @@ krb5_free_cred(context, val) void KRB5_CALLCONV krb5_free_cred_contents(context, val) krb5_context context; - krb5_creds FAR *val; + krb5_creds *val; { if (val->client) { krb5_free_principal(context, val->client); @@ -209,7 +209,7 @@ krb5_free_cred_contents(context, val) void KRB5_CALLCONV krb5_free_cred_enc_part(context, val) krb5_context context; - register krb5_cred_enc_part FAR *val; + register krb5_cred_enc_part *val; { register krb5_cred_info **temp; @@ -243,7 +243,7 @@ krb5_free_cred_enc_part(context, val) void KRB5_CALLCONV krb5_free_creds(context, val) krb5_context context; - krb5_creds FAR *val; + krb5_creds *val; { krb5_free_cred_contents(context, val); krb5_xfree(val); @@ -253,7 +253,7 @@ krb5_free_creds(context, val) void KRB5_CALLCONV krb5_free_data(context, val) krb5_context context; - krb5_data FAR * val; + krb5_data * val; { if (val->data) krb5_xfree(val->data); @@ -263,7 +263,7 @@ krb5_free_data(context, val) void KRB5_CALLCONV krb5_free_data_contents(context, val) krb5_context context; - krb5_data FAR * val; + krb5_data * val; { if (val->data) { krb5_xfree(val->data); @@ -305,7 +305,7 @@ krb5_free_enc_kdc_rep_part(context, val) void KRB5_CALLCONV krb5_free_enc_tkt_part(context, val) krb5_context context; - krb5_enc_tkt_part FAR *val; + krb5_enc_tkt_part *val; { if (val->session) krb5_free_keyblock(context, val->session); @@ -324,7 +324,7 @@ krb5_free_enc_tkt_part(context, val) void KRB5_CALLCONV krb5_free_error(context, val) krb5_context context; - register krb5_error FAR *val; + register krb5_error *val; { if (val->client) krb5_free_principal(context, val->client); @@ -340,7 +340,7 @@ krb5_free_error(context, val) void KRB5_CALLCONV krb5_free_kdc_rep(context, val) krb5_context context; - krb5_kdc_rep FAR *val; + krb5_kdc_rep *val; { if (val->padata) krb5_free_pa_data(context, val->padata); @@ -359,7 +359,7 @@ krb5_free_kdc_rep(context, val) void KRB5_CALLCONV krb5_free_kdc_req(context, val) krb5_context context; - krb5_kdc_req FAR *val; + krb5_kdc_req *val; { if (val->padata) krb5_free_pa_data(context, val->padata); @@ -383,7 +383,7 @@ krb5_free_kdc_req(context, val) void KRB5_CALLCONV krb5_free_keyblock_contents(context, key) krb5_context context; - register krb5_keyblock FAR *key; + register krb5_keyblock *key; { if (key->contents) { memset(key->contents, 0, key->length); @@ -395,7 +395,7 @@ krb5_free_keyblock_contents(context, key) void KRB5_CALLCONV krb5_free_keyblock(context, val) krb5_context context; - register krb5_keyblock FAR *val; + register krb5_keyblock *val; { krb5_free_keyblock_contents(context, val); krb5_xfree(val); @@ -406,7 +406,7 @@ krb5_free_keyblock(context, val) void KRB5_CALLCONV krb5_free_last_req(context, val) krb5_context context; - krb5_last_req_entry FAR * FAR *val; + krb5_last_req_entry **val; { register krb5_last_req_entry **temp; @@ -418,7 +418,7 @@ krb5_free_last_req(context, val) void KRB5_CALLCONV krb5_free_pa_data(context, val) krb5_context context; - krb5_pa_data FAR * FAR *val; + krb5_pa_data **val; { register krb5_pa_data **temp; @@ -454,7 +454,7 @@ krb5_free_principal(context, val) void KRB5_CALLCONV krb5_free_priv(context, val) krb5_context context; - register krb5_priv FAR *val; + register krb5_priv *val; { if (val->enc_part.ciphertext.data) krb5_xfree(val->enc_part.ciphertext.data); @@ -464,7 +464,7 @@ krb5_free_priv(context, val) void KRB5_CALLCONV krb5_free_priv_enc_part(context, val) krb5_context context; - register krb5_priv_enc_part FAR *val; + register krb5_priv_enc_part *val; { if (val->user_data.data) krb5_xfree(val->user_data.data); @@ -478,7 +478,7 @@ krb5_free_priv_enc_part(context, val) void KRB5_CALLCONV krb5_free_pwd_data(context, val) krb5_context context; - krb5_pwd_data FAR *val; + krb5_pwd_data *val; { if (val->element) krb5_free_pwd_sequences(context, val->element); @@ -489,7 +489,7 @@ krb5_free_pwd_data(context, val) void KRB5_CALLCONV krb5_free_pwd_sequences(context, val) krb5_context context; - passwd_phrase_element FAR * FAR *val; + passwd_phrase_element **val; { if ((*val)->passwd) { krb5_xfree((*val)->passwd); @@ -505,7 +505,7 @@ krb5_free_pwd_sequences(context, val) void KRB5_CALLCONV krb5_free_safe(context, val) krb5_context context; - register krb5_safe FAR *val; + register krb5_safe *val; { if (val->user_data.data) krb5_xfree(val->user_data.data); @@ -522,7 +522,7 @@ krb5_free_safe(context, val) void KRB5_CALLCONV krb5_free_ticket(context, val) krb5_context context; - krb5_ticket FAR *val; + krb5_ticket *val; { if (val->server) krb5_free_principal(context, val->server); @@ -536,7 +536,7 @@ krb5_free_ticket(context, val) void KRB5_CALLCONV krb5_free_tickets(context, val) krb5_context context; - krb5_ticket FAR * FAR *val; + krb5_ticket **val; { register krb5_ticket **temp; @@ -549,7 +549,7 @@ krb5_free_tickets(context, val) void KRB5_CALLCONV krb5_free_tgt_creds(context, tgts) krb5_context context; - krb5_creds FAR * FAR *tgts; + krb5_creds **tgts; { register krb5_creds **tgtpp; for (tgtpp = tgts; *tgtpp; tgtpp++) @@ -560,7 +560,7 @@ krb5_free_tgt_creds(context, tgts) void KRB5_CALLCONV krb5_free_tkt_authent(context, val) krb5_context context; - krb5_tkt_authent FAR *val; + krb5_tkt_authent *val; { if (val->ticket) krb5_free_ticket(context, val->ticket); @@ -572,14 +572,14 @@ krb5_free_tkt_authent(context, val) void KRB5_CALLCONV krb5_free_unparsed_name(context, val) krb5_context context; - char FAR * val; + char * val; { if (val) krb5_xfree(val); } void KRB5_CALLCONV -krb5_free_sam_challenge(krb5_context ctx, krb5_sam_challenge FAR *sc) +krb5_free_sam_challenge(krb5_context ctx, krb5_sam_challenge *sc) { if (!sc) return; @@ -588,7 +588,7 @@ krb5_free_sam_challenge(krb5_context ctx, krb5_sam_challenge FAR *sc) } void KRB5_CALLCONV -krb5_free_sam_challenge_contents(krb5_context ctx, krb5_sam_challenge FAR *sc) +krb5_free_sam_challenge_contents(krb5_context ctx, krb5_sam_challenge *sc) { if (!sc) return; @@ -611,7 +611,7 @@ krb5_free_sam_challenge_contents(krb5_context ctx, krb5_sam_challenge FAR *sc) } void KRB5_CALLCONV -krb5_free_sam_response(krb5_context ctx, krb5_sam_response FAR *sr) +krb5_free_sam_response(krb5_context ctx, krb5_sam_response *sr) { if (!sr) return; @@ -620,7 +620,7 @@ krb5_free_sam_response(krb5_context ctx, krb5_sam_response FAR *sr) } void KRB5_CALLCONV -krb5_free_sam_response_contents(krb5_context ctx, krb5_sam_response FAR *sr) +krb5_free_sam_response_contents(krb5_context ctx, krb5_sam_response *sr) { if (!sr) return; @@ -634,7 +634,7 @@ krb5_free_sam_response_contents(krb5_context ctx, krb5_sam_response FAR *sr) void KRB5_CALLCONV krb5_free_predicted_sam_response(krb5_context ctx, - krb5_predicted_sam_response FAR *psr) + krb5_predicted_sam_response *psr) { if (!psr) return; @@ -644,7 +644,7 @@ krb5_free_predicted_sam_response(krb5_context ctx, void KRB5_CALLCONV krb5_free_predicted_sam_response_contents(krb5_context ctx, - krb5_predicted_sam_response FAR *psr) + krb5_predicted_sam_response *psr) { if (!psr) return; @@ -660,7 +660,7 @@ krb5_free_predicted_sam_response_contents(krb5_context ctx, void KRB5_CALLCONV krb5_free_enc_sam_response_enc(krb5_context ctx, - krb5_enc_sam_response_enc FAR *esre) + krb5_enc_sam_response_enc *esre) { if (!esre) return; @@ -670,7 +670,7 @@ krb5_free_enc_sam_response_enc(krb5_context ctx, void KRB5_CALLCONV krb5_free_enc_sam_response_enc_contents(krb5_context ctx, - krb5_enc_sam_response_enc FAR *esre) + krb5_enc_sam_response_enc *esre) { if (!esre) return; @@ -679,7 +679,7 @@ krb5_free_enc_sam_response_enc_contents(krb5_context ctx, } void KRB5_CALLCONV -krb5_free_pa_enc_ts(krb5_context ctx, krb5_pa_enc_ts FAR *pa_enc_ts) +krb5_free_pa_enc_ts(krb5_context ctx, krb5_pa_enc_ts *pa_enc_ts) { if (!pa_enc_ts) return; diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c index b45f3def5..619881659 100644 --- a/src/lib/krb5/krb/mk_cred.c +++ b/src/lib/krb5/krb/mk_cred.c @@ -69,13 +69,13 @@ static krb5_error_code krb5_mk_ncred_basic(context, ppcreds, nppcreds, keyblock, replaydata, local_addr, remote_addr, pcred) krb5_context context; - krb5_creds FAR * FAR * ppcreds; + krb5_creds ** ppcreds; krb5_int32 nppcreds; - krb5_keyblock FAR * keyblock; - krb5_replay_data FAR * replaydata; - krb5_address FAR * local_addr; - krb5_address FAR * remote_addr; - krb5_cred FAR * pcred; + krb5_keyblock * keyblock; + krb5_replay_data * replaydata; + krb5_address * local_addr; + krb5_address * remote_addr; + krb5_cred * pcred; { krb5_cred_enc_part credenc; krb5_error_code retval; @@ -94,8 +94,8 @@ krb5_mk_ncred_basic(context, ppcreds, nppcreds, keyblock, credenc.timestamp = replaydata->timestamp; /* Get memory for creds and initialize it */ - size = sizeof(krb5_cred_info FAR *) * (nppcreds + 1); - credenc.ticket_info = (krb5_cred_info FAR * FAR *) malloc(size); + size = sizeof(krb5_cred_info *) * (nppcreds + 1); + credenc.ticket_info = (krb5_cred_info **) malloc(size); if (credenc.ticket_info == NULL) return ENOMEM; memset(credenc.ticket_info, 0, size); @@ -162,18 +162,18 @@ krb5_mk_ncred(context, auth_context, ppcreds, ppdata, outdata) krb5_context context; krb5_auth_context auth_context; - krb5_creds FAR * FAR * ppcreds; - krb5_data FAR * FAR * ppdata; - krb5_replay_data FAR * outdata; + krb5_creds ** ppcreds; + krb5_data ** ppdata; + krb5_replay_data * outdata; { - krb5_address FAR * premote_fulladdr = NULL; - krb5_address FAR * plocal_fulladdr = NULL; + krb5_address * premote_fulladdr = NULL; + krb5_address * plocal_fulladdr = NULL; krb5_address remote_fulladdr; krb5_address local_fulladdr; krb5_error_code retval; - krb5_keyblock FAR * keyblock; + krb5_keyblock * keyblock; krb5_replay_data replaydata; - krb5_cred FAR * pcred; + krb5_cred * pcred; krb5_int32 ncred; local_fulladdr.contents = 0; @@ -194,11 +194,11 @@ krb5_mk_ncred(context, auth_context, ppcreds, ppdata, outdata) memset(pcred, 0, sizeof(krb5_cred)); if ((pcred->tickets - = (krb5_ticket FAR * FAR *)malloc(sizeof(krb5_ticket FAR *) * (ncred + 1))) == NULL) { + = (krb5_ticket **)malloc(sizeof(krb5_ticket *) * (ncred + 1))) == NULL) { retval = ENOMEM; free(pcred); } - memset(pcred->tickets, 0, sizeof(krb5_ticket FAR *) * (ncred +1)); + memset(pcred->tickets, 0, sizeof(krb5_ticket *) * (ncred +1)); /* Get keyblock */ if ((keyblock = auth_context->local_subkey) == NULL) @@ -309,14 +309,14 @@ krb5_error_code KRB5_CALLCONV krb5_mk_1cred(context, auth_context, pcreds, ppdata, outdata) krb5_context context; krb5_auth_context auth_context; - krb5_creds FAR * pcreds; - krb5_data FAR * FAR * ppdata; - krb5_replay_data FAR * outdata; + krb5_creds * pcreds; + krb5_data ** ppdata; + krb5_replay_data * outdata; { krb5_error_code retval; - krb5_creds FAR * FAR *ppcreds; + krb5_creds **ppcreds; - if ((ppcreds = (krb5_creds FAR * FAR *)malloc(sizeof(*ppcreds) * 2)) == NULL) { + if ((ppcreds = (krb5_creds **)malloc(sizeof(*ppcreds) * 2)) == NULL) { return ENOMEM; } diff --git a/src/lib/krb5/krb/mk_error.c b/src/lib/krb5/krb/mk_error.c index 4a8858424..bd9519e7d 100644 --- a/src/lib/krb5/krb/mk_error.c +++ b/src/lib/krb5/krb/mk_error.c @@ -40,8 +40,8 @@ krb5_error_code KRB5_CALLCONV krb5_mk_error(context, dec_err, enc_err) krb5_context context; - const krb5_error FAR *dec_err; - krb5_data FAR *enc_err; + const krb5_error *dec_err; + krb5_data *enc_err; { krb5_error_code retval; krb5_data *new_enc_err; diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c index 2e2d748bb..13ad61940 100644 --- a/src/lib/krb5/krb/mk_priv.c +++ b/src/lib/krb5/krb/mk_priv.c @@ -119,9 +119,9 @@ krb5_error_code KRB5_CALLCONV krb5_mk_priv(context, auth_context, userdata, outbuf, outdata) krb5_context context; krb5_auth_context auth_context; - const krb5_data FAR * userdata; - krb5_data FAR * outbuf; - krb5_replay_data FAR * outdata; + const krb5_data * userdata; + krb5_data * outbuf; + krb5_replay_data * outdata; { krb5_error_code retval; krb5_keyblock * keyblock; diff --git a/src/lib/krb5/krb/mk_rep.c b/src/lib/krb5/krb/mk_rep.c index f0d124e67..ad3e7cc29 100644 --- a/src/lib/krb5/krb/mk_rep.c +++ b/src/lib/krb5/krb/mk_rep.c @@ -43,7 +43,7 @@ krb5_error_code KRB5_CALLCONV krb5_mk_rep(context, auth_context, outbuf) krb5_context context; krb5_auth_context auth_context; - krb5_data FAR * outbuf; + krb5_data * outbuf; { krb5_error_code retval; krb5_ap_rep_enc_part repl; diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c index a5e1ffbf6..340b4818f 100644 --- a/src/lib/krb5/krb/mk_req.c +++ b/src/lib/krb5/krb/mk_req.c @@ -53,13 +53,13 @@ krb5_error_code KRB5_CALLCONV krb5_mk_req(context, auth_context, ap_req_options, service, hostname, in_data, ccache, outbuf) krb5_context context; - krb5_auth_context FAR * auth_context; + krb5_auth_context * auth_context; const krb5_flags ap_req_options; - char FAR * service; - char FAR * hostname; - krb5_data FAR * in_data; + char * service; + char * hostname; + krb5_data * in_data; krb5_ccache ccache; - krb5_data FAR * outbuf; + krb5_data * outbuf; { krb5_error_code retval; krb5_principal server; diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c index 29238b8d8..8b7b5bb42 100644 --- a/src/lib/krb5/krb/mk_req_ext.c +++ b/src/lib/krb5/krb/mk_req_ext.c @@ -74,11 +74,11 @@ krb5_error_code KRB5_CALLCONV krb5_mk_req_extended(context, auth_context, ap_req_options, in_data, in_creds, outbuf) krb5_context context; - krb5_auth_context FAR * auth_context; + krb5_auth_context * auth_context; const krb5_flags ap_req_options; - krb5_data FAR * in_data; - krb5_creds FAR * in_creds; - krb5_data FAR * outbuf; + krb5_data * in_data; + krb5_creds * in_creds; + krb5_data * outbuf; { krb5_error_code retval; krb5_checksum checksum; diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c index ffd530ed1..eef712007 100644 --- a/src/lib/krb5/krb/mk_safe.c +++ b/src/lib/krb5/krb/mk_safe.c @@ -118,9 +118,9 @@ krb5_error_code KRB5_CALLCONV krb5_mk_safe(context, auth_context, userdata, outbuf, outdata) krb5_context context; krb5_auth_context auth_context; - const krb5_data FAR * userdata; - krb5_data FAR * outbuf; - krb5_replay_data FAR * outdata; + const krb5_data * userdata; + krb5_data * outbuf; + krb5_replay_data * outdata; { krb5_error_code retval; krb5_keyblock * keyblock; diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c index 0d1b9db75..6aded4050 100644 --- a/src/lib/krb5/krb/parse.c +++ b/src/lib/krb5/krb/parse.c @@ -66,8 +66,8 @@ krb5_error_code KRB5_CALLCONV krb5_parse_name(context, name, nprincipal) krb5_context context; - const char FAR *name; - krb5_principal FAR *nprincipal; + const char *name; + krb5_principal *nprincipal; { register const char *cp; register char *q; @@ -188,7 +188,7 @@ krb5_parse_name(context, name, nprincipal) else krb5_princ_component(context, principal, i)->length = size; if (i + 1 != components) { -#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh) +#if !defined(_WIN32) && !defined(macintosh) fprintf(stderr, "Programming error in krb5_parse_name!"); exit(1); diff --git a/src/lib/krb5/krb/preauth.c b/src/lib/krb5/krb/preauth.c index 54f6a9539..730d25c6a 100644 --- a/src/lib/krb5/krb/preauth.c +++ b/src/lib/krb5/krb/preauth.c @@ -33,10 +33,6 @@ #include <stdio.h> #include <time.h> #include <syslog.h> -#ifdef _MSDOS -#define getpid _getpid -#include <process.h> -#endif static krb5_error_code obtain_enc_ts_padata (krb5_context, diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c index 2852e4951..dc8d44253 100644 --- a/src/lib/krb5/krb/rd_cred.c +++ b/src/lib/krb5/krb/rd_cred.c @@ -209,9 +209,9 @@ krb5_error_code KRB5_CALLCONV krb5_rd_cred(context, auth_context, pcreddata, pppcreds, outdata) krb5_context context; krb5_auth_context auth_context; - krb5_data FAR * pcreddata; - krb5_creds FAR * FAR * FAR * pppcreds; - krb5_replay_data FAR * outdata; + krb5_data * pcreddata; + krb5_creds *** pppcreds; + krb5_replay_data * outdata; { krb5_error_code retval; krb5_keyblock * keyblock; diff --git a/src/lib/krb5/krb/rd_error.c b/src/lib/krb5/krb/rd_error.c index 0431fd176..aca18de4a 100644 --- a/src/lib/krb5/krb/rd_error.c +++ b/src/lib/krb5/krb/rd_error.c @@ -42,8 +42,8 @@ krb5_error_code KRB5_CALLCONV krb5_rd_error(context, enc_errbuf, dec_error) krb5_context context; - const krb5_data FAR *enc_errbuf; - krb5_error FAR * FAR *dec_error; + const krb5_data *enc_errbuf; + krb5_error **dec_error; { if (!krb5_is_krb_error(enc_errbuf)) return KRB5KRB_AP_ERR_MSG_TYPE; diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c index 274d0841b..f4adea75f 100644 --- a/src/lib/krb5/krb/rd_priv.c +++ b/src/lib/krb5/krb/rd_priv.c @@ -161,9 +161,9 @@ krb5_error_code KRB5_CALLCONV krb5_rd_priv(context, auth_context, inbuf, outbuf, outdata) krb5_context context; krb5_auth_context auth_context; - const krb5_data FAR * inbuf; - krb5_data FAR * outbuf; - krb5_replay_data FAR * outdata; + const krb5_data * inbuf; + krb5_data * outbuf; + krb5_replay_data * outdata; { krb5_error_code retval; krb5_keyblock * keyblock; diff --git a/src/lib/krb5/krb/rd_rep.c b/src/lib/krb5/krb/rd_rep.c index 14a60b8dd..f6202df82 100644 --- a/src/lib/krb5/krb/rd_rep.c +++ b/src/lib/krb5/krb/rd_rep.c @@ -45,8 +45,8 @@ krb5_error_code KRB5_CALLCONV krb5_rd_rep(context, auth_context, inbuf, repl) krb5_context context; krb5_auth_context auth_context; - const krb5_data FAR * inbuf; - krb5_ap_rep_enc_part FAR * FAR *repl; + const krb5_data * inbuf; + krb5_ap_rep_enc_part **repl; { krb5_error_code retval; krb5_ap_rep * reply; diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c index 0c4a605ba..0e64f9637 100644 --- a/src/lib/krb5/krb/rd_req.c +++ b/src/lib/krb5/krb/rd_req.c @@ -49,12 +49,12 @@ krb5_error_code KRB5_CALLCONV krb5_rd_req(context, auth_context, inbuf, server, keytab, ap_req_options, ticket) krb5_context context; - krb5_auth_context FAR * auth_context; - const krb5_data FAR * inbuf; + krb5_auth_context * auth_context; + const krb5_data * inbuf; krb5_const_principal server; /* XXX do we really need this */ krb5_keytab keytab; - krb5_flags FAR * ap_req_options; - krb5_ticket FAR *FAR * ticket; + krb5_flags * ap_req_options; + krb5_ticket ** ticket; { krb5_error_code retval; krb5_ap_req * request; diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c index 7cb7b11b4..a7f87b23d 100644 --- a/src/lib/krb5/krb/rd_safe.c +++ b/src/lib/krb5/krb/rd_safe.c @@ -155,9 +155,9 @@ krb5_error_code KRB5_CALLCONV krb5_rd_safe(context, auth_context, inbuf, outbuf, outdata) krb5_context context; krb5_auth_context auth_context; - const krb5_data FAR * inbuf; - krb5_data FAR * outbuf; - krb5_replay_data FAR * outdata; + const krb5_data * inbuf; + krb5_data * outbuf; + krb5_replay_data * outdata; { krb5_error_code retval; krb5_keyblock * keyblock; diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c index 8f81f7287..e7b135704 100644 --- a/src/lib/krb5/krb/recvauth.c +++ b/src/lib/krb5/krb/recvauth.c @@ -39,16 +39,16 @@ static char *sendauth_version = "KRB5_SENDAUTH_V1.0"; static krb5_error_code recvauth_common(krb5_context context, - krb5_auth_context FAR * auth_context, + krb5_auth_context * auth_context, /* IN */ krb5_pointer fd, - char FAR *appl_version, + char *appl_version, krb5_principal server, krb5_int32 flags, krb5_keytab keytab, /* OUT */ - krb5_ticket FAR * FAR * ticket, - krb5_data FAR *version) + krb5_ticket ** ticket, + krb5_data *version) { krb5_auth_context new_auth_context; krb5_flags ap_option; @@ -252,13 +252,13 @@ krb5_recvauth(context, auth_context, /* OUT */ ticket) krb5_context context; - krb5_auth_context FAR * auth_context; + krb5_auth_context * auth_context; krb5_pointer fd; - char FAR * appl_version; + char * appl_version; krb5_principal server; krb5_int32 flags; krb5_keytab keytab; - krb5_ticket FAR * FAR * ticket; + krb5_ticket ** ticket; { return recvauth_common (context, auth_context, fd, appl_version, server, flags, keytab, ticket, 0); @@ -266,15 +266,15 @@ krb5_recvauth(context, auth_context, krb5_error_code KRB5_CALLCONV krb5_recvauth_version(krb5_context context, - krb5_auth_context FAR *auth_context, + krb5_auth_context *auth_context, /* IN */ krb5_pointer fd, krb5_principal server, krb5_int32 flags, krb5_keytab keytab, /* OUT */ - krb5_ticket FAR * FAR *ticket, - krb5_data FAR *version) + krb5_ticket **ticket, + krb5_data *version) { return recvauth_common (context, auth_context, fd, 0, server, flags, keytab, ticket, version); diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c index 41479f6d0..0cf0aa654 100644 --- a/src/lib/krb5/krb/sendauth.c +++ b/src/lib/krb5/krb/sendauth.c @@ -61,23 +61,23 @@ krb5_sendauth(context, auth_context, /* OUT */ error, rep_result, out_creds) krb5_context context; - krb5_auth_context FAR * auth_context; + krb5_auth_context * auth_context; krb5_pointer fd; - char FAR * appl_version; + char * appl_version; krb5_principal client; krb5_principal server; krb5_flags ap_req_options; - krb5_data FAR * in_data; - krb5_creds FAR * in_creds; + krb5_data * in_data; + krb5_creds * in_creds; krb5_ccache ccache; - krb5_error FAR * FAR * error; - krb5_ap_rep_enc_part FAR * FAR * rep_result; - krb5_creds FAR * FAR * out_creds; + krb5_error ** error; + krb5_ap_rep_enc_part ** rep_result; + krb5_creds ** out_creds; { krb5_octet result; krb5_creds creds; - krb5_creds FAR * credsp = NULL; - krb5_creds FAR * credspout = NULL; + krb5_creds * credsp = NULL; + krb5_creds * credspout = NULL; krb5_error_code retval = 0; krb5_data inbuf, outbuf; int len; diff --git a/src/lib/krb5/krb/serialize.c b/src/lib/krb5/krb/serialize.c index 9b80eae9f..968a0ce9c 100644 --- a/src/lib/krb5/krb/serialize.c +++ b/src/lib/krb5/krb/serialize.c @@ -120,8 +120,8 @@ krb5_externalize_opaque(kcontext, odtype, arg, bufpp, sizep) krb5_context kcontext; krb5_magic odtype; krb5_pointer arg; - krb5_octet FAR * FAR *bufpp; - size_t FAR *sizep; + krb5_octet **bufpp; + size_t *sizep; { krb5_error_code kret; krb5_ser_handle shandle; @@ -180,9 +180,9 @@ krb5_error_code KRB5_CALLCONV krb5_internalize_opaque(kcontext, odtype, argp, bufpp, sizep) krb5_context kcontext; krb5_magic odtype; - krb5_pointer FAR *argp; - krb5_octet FAR * FAR *bufpp; - size_t FAR *sizep; + krb5_pointer *argp; + krb5_octet **bufpp; + size_t *sizep; { krb5_error_code kret; krb5_ser_handle shandle; @@ -202,8 +202,8 @@ krb5_internalize_opaque(kcontext, odtype, argp, bufpp, sizep) krb5_error_code KRB5_CALLCONV krb5_ser_pack_int32(iarg, bufp, remainp) krb5_int32 iarg; - krb5_octet FAR * FAR *bufp; - size_t FAR *remainp; + krb5_octet **bufp; + size_t *remainp; { if (*remainp >= sizeof(krb5_int32)) { (*bufp)[0] = (krb5_octet) ((iarg >> 24) & 0xff); @@ -223,10 +223,10 @@ krb5_ser_pack_int32(iarg, bufp, remainp) */ krb5_error_code KRB5_CALLCONV krb5_ser_pack_bytes(ostring, osize, bufp, remainp) - krb5_octet FAR *ostring; + krb5_octet *ostring; size_t osize; - krb5_octet FAR * FAR *bufp; - size_t FAR *remainp; + krb5_octet **bufp; + size_t *remainp; { if (*remainp >= osize) { memcpy(*bufp, ostring, osize); @@ -243,9 +243,9 @@ krb5_ser_pack_bytes(ostring, osize, bufp, remainp) */ krb5_error_code KRB5_CALLCONV krb5_ser_unpack_int32(intp, bufp, remainp) - krb5_int32 FAR *intp; - krb5_octet FAR * FAR *bufp; - size_t FAR *remainp; + krb5_int32 *intp; + krb5_octet **bufp; + size_t *remainp; { if (*remainp >= sizeof(krb5_int32)) { *intp = (((krb5_int32) ((unsigned char) (*bufp)[0]) << 24) | @@ -265,10 +265,10 @@ krb5_ser_unpack_int32(intp, bufp, remainp) */ krb5_error_code KRB5_CALLCONV krb5_ser_unpack_bytes(istring, isize, bufp, remainp) - krb5_octet FAR *istring; + krb5_octet *istring; size_t isize; - krb5_octet FAR * FAR *bufp; - size_t FAR *remainp; + krb5_octet **bufp; + size_t *remainp; { if (*remainp >= isize) { memcpy(istring, *bufp, isize); diff --git a/src/lib/krb5/krb/set_realm.c b/src/lib/krb5/krb/set_realm.c index f60cf9f56..5324e1919 100644 --- a/src/lib/krb5/krb/set_realm.c +++ b/src/lib/krb5/krb/set_realm.c @@ -30,7 +30,7 @@ krb5_error_code KRB5_CALLCONV krb5_set_principal_realm(context, principal, realm) krb5_context context; krb5_principal principal; - const char FAR *realm; + const char *realm; { size_t length; char *newrealm; diff --git a/src/lib/krb5/krb/str_conv.c b/src/lib/krb5/krb/str_conv.c index 2a48b2dc2..8296157ec 100644 --- a/src/lib/krb5/krb/str_conv.c +++ b/src/lib/krb5/krb/str_conv.c @@ -79,8 +79,8 @@ static const int salttype_table_nents = sizeof(salttype_table)/ krb5_error_code KRB5_CALLCONV krb5_string_to_salttype(string, salttypep) - char FAR * string; - krb5_int32 FAR * salttypep; + char * string; + krb5_int32 * salttypep; { int i; int found; @@ -105,7 +105,7 @@ krb5_string_to_salttype(string, salttypep) krb5_error_code KRB5_CALLCONV krb5_salttype_to_string(salttype, buffer, buflen) krb5_int32 salttype; - char FAR * buffer; + char * buffer; size_t buflen; { int i; @@ -150,8 +150,8 @@ static char *strptime (const char *, const char *, struct tm *); krb5_error_code KRB5_CALLCONV krb5_string_to_timestamp(string, timestampp) - char FAR * string; - krb5_timestamp FAR * timestampp; + char * string; + krb5_timestamp * timestampp; { int i; struct tm timebuf; @@ -204,7 +204,7 @@ krb5_string_to_timestamp(string, timestampp) krb5_error_code KRB5_CALLCONV krb5_timestamp_to_string(timestamp, buffer, buflen) krb5_timestamp timestamp; - char FAR * buffer; + char * buffer; size_t buflen; { int ret; @@ -221,9 +221,9 @@ krb5_timestamp_to_string(timestamp, buffer, buflen) krb5_error_code KRB5_CALLCONV krb5_timestamp_to_sfstring(timestamp, buffer, buflen, pad) krb5_timestamp timestamp; - char FAR * buffer; + char * buffer; size_t buflen; - char FAR * pad; + char * pad; { struct tm *tmp; size_t i; @@ -269,7 +269,7 @@ krb5_timestamp_to_sfstring(timestamp, buffer, buflen, pad) krb5_error_code KRB5_CALLCONV krb5_deltat_to_string(deltat, buffer, buflen) krb5_deltat deltat; - char FAR * buffer; + char * buffer; size_t buflen; { int days, hours, minutes, seconds; diff --git a/src/lib/krb5/krb/unparse.c b/src/lib/krb5/krb/unparse.c index 51b49788d..12755d924 100644 --- a/src/lib/krb5/krb/unparse.c +++ b/src/lib/krb5/krb/unparse.c @@ -61,8 +61,8 @@ krb5_error_code KRB5_CALLCONV krb5_unparse_name_ext(context, principal, name, size) krb5_context context; krb5_const_principal principal; - register char FAR * FAR *name; - unsigned int FAR *size; + register char **name; + unsigned int *size; { register char *cp, *q; register int i,j; diff --git a/src/lib/krb5/krb/x-deltat.y b/src/lib/krb5/krb/x-deltat.y index 3305888c8..91da7b945 100644 --- a/src/lib/krb5/krb/x-deltat.y +++ b/src/lib/krb5/krb/x-deltat.y @@ -217,8 +217,8 @@ mylex (krb5_int32 *intp, char **pp) krb5_error_code KRB5_CALLCONV krb5_string_to_deltat(string, deltatp) - char FAR * string; - krb5_deltat FAR * deltatp; + char * string; + krb5_deltat * deltatp; { struct param p; p.delta = 0; diff --git a/src/lib/krb5/krb5_libinit.c b/src/lib/krb5/krb5_libinit.c index c3a192bc2..f303046cf 100644 --- a/src/lib/krb5/krb5_libinit.c +++ b/src/lib/krb5/krb5_libinit.c @@ -36,7 +36,7 @@ void krb5int_cleanup_library (void) { assert (initialized); -#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh) +#if defined(_WIN32) || defined(macintosh) krb5_stdcc_shutdown(); #endif diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index 67afe3278..b5c0e139e 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,14 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * an_to_ln.c, c_ustime.c, ccdefname.c, init_os_ctx.c, ktdefname.c, + kuserok.c, localaddr.c, lock_file.c, prompter.c, promptusr.c, + read_pwd.c: Drop _MSDOS support. + + * ccdefname.c, def_realm.c, free_hstrl.c, hst_realm.c, + ktdefname.c, localaddr.c, mk_faddr.c, read_pwd.c, sn2princ.c, + timeofday.c, ustime.c: Don't explicitly declare pointers FAR any + more. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> * accessor.c, ccdefname.c, changepw.c, def_realm.c, free_hstrl.c, diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c index b9b0d6079..ffc0ac5b1 100644 --- a/src/lib/krb5/os/an_to_ln.c +++ b/src/lib/krb5/os/an_to_ln.c @@ -101,7 +101,7 @@ db_an_to_ln(context, dbname, aname, lnsize, lname) const unsigned int lnsize; char *lname; { -#if (!defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)) +#if (!defined(_WIN32) && !defined(macintosh)) DBM *db; krb5_error_code retval; datum key, contents; @@ -137,13 +137,13 @@ db_an_to_ln(context, dbname, aname, lnsize, lname) /* can't close until we copy the contents. */ (void) KDBM_CLOSE(db); return retval; -#else /* !_MSDOS && !_WIN32 && !MACINTOSH */ +#else /* !_WIN32 && !MACINTOSH */ /* * If we don't have support for a database mechanism, then we can't * translate this now, can we? */ return KRB5_LNAME_NOTRANS; -#endif /* !_MSDOS && !_WIN32 && !MACINTOSH */ +#endif /* !_WIN32 && !MACINTOSH */ } #endif /*ANAME_DB*/ diff --git a/src/lib/krb5/os/c_ustime.c b/src/lib/krb5/os/c_ustime.c index 5f735871a..92585a89d 100644 --- a/src/lib/krb5/os/c_ustime.c +++ b/src/lib/krb5/os/c_ustime.c @@ -292,127 +292,6 @@ register krb5_int32 *seconds, *microseconds; return 0; } -#elif defined (_MSDOS) - - -/* - * Originally written by John Gilmore, Cygnus Support, May '94. - * Public Domain. - */ - -#include <time.h> -#include <sys/timeb.h> -#include <dos.h> -#include <string.h> - -/* - * Time handling. Translate Unix time calls into Kerberos internal - * procedure calls. - * - * Due to the fact that DOS time can be unreliable we have reverted - * to using the AT hardware clock and converting it to Unix time. - */ - -static time_t win_gettime (); -static long win_time_get_epoch(); /* Adjust for MSC 7.00 bug */ - -krb5_error_code -krb5_crypto_us_timeofday(seconds, microseconds) -register krb5_int32 *seconds, *microseconds; -{ - krb5_int32 sec, usec; - static krb5_int32 last_sec = 0; - static krb5_int32 last_usec = 0; - - sec = win_gettime (); /* Get the current time */ - usec = 0; /* Can't do microseconds */ - - if (sec == last_sec) { /* Same as last time??? */ - usec = ++last_usec; /* Yep, so do microseconds */ - if (usec >= 1000000) { - ++sec; - usec = 0; - } - } - last_sec = sec; /* Remember for next time */ - last_usec = usec; - - *seconds = sec; /* Return the values */ - *microseconds = usec; - - return 0; -} - - -static time_t -win_gettime () { - struct tm tm; - union _REGS inregs; /* For calling BIOS */ - union _REGS outregs; - struct _timeb now; - time_t time; - long convert; /* MSC 7.00 bug work around */ - - _ftime(&now); /* Daylight savings time */ - - /* Get time from AT hardware clock INT 0x1A, AH=2 */ - memset(&inregs, 0, sizeof(inregs)); - inregs.h.ah = 2; - _int86(0x1a, &inregs, &outregs); - - /* 0x13 = decimal 13, hence the decoding below */ - tm.tm_sec = 10 * ((outregs.h.dh & 0xF0) >> 4) + (outregs.h.dh & 0x0F); - tm.tm_min = 10 * ((outregs.h.cl & 0xF0) >> 4) + (outregs.h.cl & 0x0F); - tm.tm_hour = 10 * ((outregs.h.ch & 0xF0) >> 4) + (outregs.h.ch & 0x0F); - - /* Get date from AT hardware clock INT 0x1A, AH=4 */ - memset(&inregs, 0, sizeof(inregs)); - inregs.h.ah = 4; - _int86(0x1a, &inregs, &outregs); - - tm.tm_mday = 10 * ((outregs.h.dl & 0xF0) >> 4) + (outregs.h.dl & 0x0F); - tm.tm_mon = 10 * ((outregs.h.dh & 0xF0) >> 4) + (outregs.h.dh & 0x0F) - 1; - tm.tm_year = 10 * ((outregs.h.cl & 0xF0) >> 4) + (outregs.h.cl & 0x0F); - tm.tm_year += 100 * ((10 * (outregs.h.ch & 0xF0) >> 4) - + (outregs.h.ch & 0x0F) - 19); - - tm.tm_wday = 0; - tm.tm_yday = 0; - tm.tm_isdst = now.dstflag; - - time = mktime(&tm); - - convert = win_time_get_epoch(); - return time + convert; - -} - - -/* - * This routine figures out the current time epoch and returns the - * conversion factor. It exists because - * Microloss screwed the pooch on the time() and _ftime() calls in - * its release 7.0 libraries. They changed the epoch to Dec 31, 1899! - * Idiots... We try to cope. - */ - -static struct tm jan_1_70 = {0, 0, 0, 1, 0, 70}; -static long epoch = 0; -static int epoch_set = 0; - -long -win_time_get_epoch() -{ - - if (!epoch_set) { - epoch = 0 - mktime (&jan_1_70); /* Seconds til 1970 localtime */ - epoch += _timezone; /* Seconds til 1970 GMT */ - epoch_set = 1; - } - return epoch; -} - - #else diff --git a/src/lib/krb5/os/ccdefname.c b/src/lib/krb5/os/ccdefname.c index 4ed147d13..3556997bb 100644 --- a/src/lib/krb5/os/ccdefname.c +++ b/src/lib/krb5/os/ccdefname.c @@ -142,7 +142,7 @@ try_dir( } #endif -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) static krb5_error_code get_from_os(char *name_buf, int name_size) { char *prefix = krb5_cc_dfl_ops->prefix; @@ -221,7 +221,7 @@ cleanup: } #else -#if !(defined(_MSDOS) || defined(_WIN32)) +#if !(defined(_WIN32)) static krb5_error_code get_from_os(char *name_buf, int name_size) { sprintf(name_buf, "FILE:/tmp/krb5cc_%ld", (long) getuid()); @@ -276,7 +276,7 @@ krb5_cc_set_default_name(context, name) } -const char FAR * KRB5_CALLCONV +const char * KRB5_CALLCONV krb5_cc_default_name(context) krb5_context context; { diff --git a/src/lib/krb5/os/def_realm.c b/src/lib/krb5/os/def_realm.c index 38889f53e..9b9ca49b4 100644 --- a/src/lib/krb5/os/def_realm.c +++ b/src/lib/krb5/os/def_realm.c @@ -71,7 +71,7 @@ krb5_error_code KRB5_CALLCONV krb5_get_default_realm(context, lrealm) krb5_context context; - char FAR * FAR *lrealm; + char **lrealm; { char *realm = 0; char *cp; @@ -209,7 +209,7 @@ krb5_set_default_realm(context, lrealm) void KRB5_CALLCONV krb5_free_default_realm(context, lrealm) krb5_context context; - char FAR* lrealm; + char *lrealm; { free (lrealm); } diff --git a/src/lib/krb5/os/free_hstrl.c b/src/lib/krb5/os/free_hstrl.c index 3e5b86990..026cb28b8 100644 --- a/src/lib/krb5/os/free_hstrl.c +++ b/src/lib/krb5/os/free_hstrl.c @@ -37,7 +37,7 @@ krb5_error_code KRB5_CALLCONV krb5_free_host_realm(context, realmlist) krb5_context context; - char FAR * const FAR *realmlist; + char * const *realmlist; { /* same format, so why duplicate code? */ return krb5_free_krbhst(context, realmlist); diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c index a44c67d71..c973ba3f4 100644 --- a/src/lib/krb5/os/hst_realm.c +++ b/src/lib/krb5/os/hst_realm.c @@ -235,8 +235,8 @@ krb5_try_realm_txt_rr(prefix, name, realm) krb5_error_code KRB5_CALLCONV krb5_get_host_realm(context, host, realmsp) krb5_context context; - const char FAR *host; - char FAR * FAR * FAR *realmsp; + const char *host; + char ***realmsp; { char **retrealms; char *default_realm, *realm, *cp, *temp_realm; diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index c43d1a464..7939cbaa1 100644 --- a/src/lib/krb5/os/init_os_ctx.c +++ b/src/lib/krb5/os/init_os_ctx.c @@ -34,7 +34,7 @@ #include <PreferencesLib.h> #endif /* macintosh */ -#if !defined(macintosh) && !defined(_MSDOS) && !defined(_WIN32) +#if !defined(macintosh) && !defined(_WIN32) #define USE_RANDOM_DEVICE #include <sys/ioctl.h> /* for FIONBIO */ #ifdef HAVE_SYS_FILIO_H @@ -42,7 +42,7 @@ #endif #endif -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) static krb5_error_code get_from_windows_dir( @@ -173,7 +173,7 @@ get_from_registry( return retval; } -#endif /* _MSDOS || _WIN32 */ +#endif /* _WIN32 */ static void free_filespecs(files) @@ -287,7 +287,7 @@ os_get_default_config_files(pfiles, secure) return ENOENT; #else /* !macintosh */ -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) krb5_error_code retval = 0; char *name = 0; @@ -332,7 +332,7 @@ os_get_default_config_files(pfiles, secure) files = malloc(2 * sizeof(char *)); files[0] = name; files[1] = 0; -#else /* !_MSDOS && !_WIN32 */ +#else /* !_WIN32 */ char* filepath = 0; int n_entries, i; unsigned int ent_len; @@ -372,7 +372,7 @@ os_get_default_config_files(pfiles, secure) } /* cap the array */ files[i] = 0; -#endif /* !_MSDOS && !_WIN32 */ +#endif /* !_WIN32 */ #endif /* !macintosh */ *pfiles = files; return 0; diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c index e2bca91df..18ae376c6 100644 --- a/src/lib/krb5/os/ktdefname.c +++ b/src/lib/krb5/os/ktdefname.c @@ -39,7 +39,7 @@ char *krb5_overridekeyname = NULL; krb5_error_code KRB5_CALLCONV krb5_kt_default_name(context, name, namesize) krb5_context context; - char FAR *name; + char *name; int namesize; { char *cp = 0; @@ -64,7 +64,7 @@ krb5_kt_default_name(context, name, namesize) strcpy(name, retval); profile_release_string(retval); } else { -#if defined (_MSDOS) || defined(_WIN32) +#if defined(_WIN32) { char defname[160]; int len; diff --git a/src/lib/krb5/os/kuserok.c b/src/lib/krb5/os/kuserok.c index bf3c2968b..b34727cf4 100644 --- a/src/lib/krb5/os/kuserok.c +++ b/src/lib/krb5/os/kuserok.c @@ -28,7 +28,7 @@ */ #include "k5-int.h" -#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh) /* Not yet for Windows */ +#if !defined(_WIN32) && !defined(macintosh) /* Not yet for Windows */ #include <stdio.h> #include <pwd.h> @@ -141,7 +141,7 @@ krb5_kuserok(context, principal, luser) return(isok); } -#else /* _MSDOS */ +#else /* _WIN32 || macintosh */ /* * If the given Kerberos name "server" translates to the same name as "luser" @@ -163,4 +163,4 @@ krb5_kuserok(context, principal, luser) return FALSE; } -#endif /* _MSDOS */ +#endif /* _WIN32 || macintosh */ diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c index d254c6147..021d2b6af 100644 --- a/src/lib/krb5/os/localaddr.c +++ b/src/lib/krb5/os/localaddr.c @@ -32,7 +32,7 @@ #define NEED_SOCKETS #include "k5-int.h" -#if !defined(HAVE_MACSOCK_H) && !defined(_MSDOS) && !defined(_WIN32) +#if !defined(HAVE_MACSOCK_H) && !defined(_WIN32) /* needed for solaris, harmless elsewhere... */ #define BSD_COMP @@ -909,7 +909,7 @@ krb5_os_localaddr_profile (krb5_context context, struct localaddr_data *datap) krb5_error_code KRB5_CALLCONV krb5_os_localaddr(context, addr) krb5_context context; - krb5_address FAR * FAR * FAR *addr; + krb5_address ***addr; { struct localaddr_data data = { 0 }; int r; @@ -1015,7 +1015,7 @@ krb5_os_localaddr(context, addr) * local IP address, courtesy of Windows Socket Network Programming, * by Robert Quinn */ -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) static struct hostent *local_addr_fallback_kludge() { static struct hostent host; @@ -1038,7 +1038,7 @@ static struct hostent *local_addr_fallback_kludge() if (err == SOCKET_ERROR) return NULL; - err = getsockname(sock, (LPSOCKADDR) &addr, (int FAR *) size); + err = getsockname(sock, (LPSOCKADDR) &addr, (int *) size); if (err == SOCKET_ERROR) return NULL; diff --git a/src/lib/krb5/os/lock_file.c b/src/lib/krb5/os/lock_file.c index 55f86343a..6cd0ddd7d 100644 --- a/src/lib/krb5/os/lock_file.c +++ b/src/lib/krb5/os/lock_file.c @@ -30,7 +30,7 @@ #include "k5-int.h" #include <stdio.h> -#if !defined(_MSDOS) && !defined(_WIN32) && !defined(HAVE_MACSOCK_H) +#if !defined(_WIN32) && !defined(HAVE_MACSOCK_H) /* Unix version... */ @@ -132,7 +132,7 @@ krb5_lock_file(context, fd, mode) return retval; } -#else /* MSDOS or Macintosh */ +#else /* Windows or Macintosh */ krb5_error_code krb5_lock_file(context, fd, mode) diff --git a/src/lib/krb5/os/mk_faddr.c b/src/lib/krb5/os/mk_faddr.c index 66167cd96..d40e42ca4 100644 --- a/src/lib/krb5/os/mk_faddr.c +++ b/src/lib/krb5/os/mk_faddr.c @@ -41,11 +41,11 @@ krb5_error_code krb5_make_fulladdr(context, kaddr, kport, raddr) krb5_context context; - krb5_address FAR * kaddr; - krb5_address FAR * kport; - krb5_address FAR * raddr; + krb5_address * kaddr; + krb5_address * kport; + krb5_address * raddr; { - register krb5_octet FAR * marshal; + register krb5_octet * marshal; krb5_int32 tmp32; krb5_int16 tmp16; @@ -53,7 +53,7 @@ krb5_make_fulladdr(context, kaddr, kport, raddr) return EINVAL; raddr->length = kaddr->length + kport->length + (4 * sizeof(krb5_int32)); - if (!(raddr->contents = (krb5_octet FAR *)malloc(raddr->length))) + if (!(raddr->contents = (krb5_octet *)malloc(raddr->length))) return ENOMEM; raddr->addrtype = ADDRTYPE_ADDRPORT; diff --git a/src/lib/krb5/os/prompter.c b/src/lib/krb5/os/prompter.c index 87f0171cc..7a3de40d2 100644 --- a/src/lib/krb5/os/prompter.c +++ b/src/lib/krb5/os/prompter.c @@ -1,5 +1,5 @@ #include "k5-int.h" -#if !defined(_MSDOS) && (!defined(_WIN32) || (defined(_WIN32) && defined(__CYGWIN32__))) && !defined(macintosh) +#if (!defined(_WIN32) || (defined(_WIN32) && defined(__CYGWIN32__))) && !defined(macintosh) #include <stdio.h> #include <errno.h> #include <signal.h> @@ -131,7 +131,7 @@ cleanup: #endif return(errcode); } -#else /* MSDOS */ +#else /* non-Cygwin Windows, or Mac */ #if defined(_WIN32) @@ -240,7 +240,7 @@ krb5_prompter_posix(krb5_context context, return(EINVAL); } #endif /* !_WIN32 */ -#endif /* !MSDOS */ +#endif /* Windows or Mac */ void krb5int_set_prompt_types(context, types) diff --git a/src/lib/krb5/os/promptusr.c b/src/lib/krb5/os/promptusr.c index 3ac3d4f08..1e862b525 100644 --- a/src/lib/krb5/os/promptusr.c +++ b/src/lib/krb5/os/promptusr.c @@ -3,7 +3,7 @@ */ #include "k5-int.h" -#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh) +#if !defined(_WIN32) && !defined(macintosh) #include <stdio.h> #include <stdlib.h> diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c index 62c7283cc..557e3b65c 100644 --- a/src/lib/krb5/os/read_pwd.c +++ b/src/lib/krb5/os/read_pwd.c @@ -29,7 +29,7 @@ #include "k5-int.h" -#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh) +#if !defined(_WIN32) && !defined(macintosh) #define DEFINED_KRB5_READ_PASSWORD #include <stdio.h> #include <errno.h> @@ -162,7 +162,7 @@ cleanup: } #endif -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) #define DEFINED_KRB5_READ_PASSWORD #include <io.h> @@ -287,11 +287,11 @@ cleanup: static int CALLBACK read_pwd_proc(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) { - pwd_params FAR *dp; + pwd_params *dp; switch(msg) { case WM_INITDIALOG: - dp = (pwd_params FAR *) lParam; + dp = (pwd_params *) lParam; SetWindowLong(hdlg, DWL_USER, lParam); SetDlgItemText(hdlg, ID_READ_PWD_PROMPT, dp->pwd_prompt); SetDlgItemText(hdlg, ID_READ_PWD_PROMPT2, dp->pwd_prompt2); @@ -300,7 +300,7 @@ read_pwd_proc(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) return TRUE; case WM_COMMAND: - dp = (pwd_params FAR *) GetWindowLong(hdlg, DWL_USER); + dp = (pwd_params *) GetWindowLong(hdlg, DWL_USER); switch (wParam) { case IDOK: *(dp->pwd_size_return) = diff --git a/src/lib/krb5/os/sn2princ.c b/src/lib/krb5/os/sn2princ.c index a4e1c20c6..ba32c0a23 100644 --- a/src/lib/krb5/os/sn2princ.c +++ b/src/lib/krb5/os/sn2princ.c @@ -38,10 +38,10 @@ krb5_error_code KRB5_CALLCONV krb5_sname_to_principal(context, hostname, sname, type, ret_princ) krb5_context context; - const char FAR * hostname; - const char FAR * sname; + const char * hostname; + const char * sname; krb5_int32 type; - krb5_principal FAR * ret_princ; + krb5_principal * ret_princ; { struct hostent *hp; char **hrealms, *realm, *remote_host; diff --git a/src/lib/krb5/os/timeofday.c b/src/lib/krb5/os/timeofday.c index dccfcffb5..143993c4b 100644 --- a/src/lib/krb5/os/timeofday.c +++ b/src/lib/krb5/os/timeofday.c @@ -39,7 +39,7 @@ extern int errno; krb5_error_code KRB5_CALLCONV krb5_timeofday(context, timeret) krb5_context context; - register krb5_int32 FAR *timeret; + register krb5_int32 *timeret; { krb5_os_context os_ctx = context->os_context; time_t tval; diff --git a/src/lib/krb5/os/ustime.c b/src/lib/krb5/os/ustime.c index 18b3d4f47..e407e8d95 100644 --- a/src/lib/krb5/os/ustime.c +++ b/src/lib/krb5/os/ustime.c @@ -36,8 +36,8 @@ krb5_error_code KRB5_CALLCONV krb5_us_timeofday(context, seconds, microseconds) krb5_context context; - krb5_int32 FAR *seconds; - krb5_int32 FAR *microseconds; + krb5_int32 *seconds; + krb5_int32 *microseconds; { krb5_os_context os_ctx = context->os_context; krb5_int32 sec, usec; diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog index fbc8a6cd3..8ae18837a 100644 --- a/src/lib/krb5/posix/ChangeLog +++ b/src/lib/krb5/posix/ChangeLog @@ -1,3 +1,7 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * syslog.c: Drop _MSDOS support. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> * sscanf.c: Don't use KRB5_DLLIMP. diff --git a/src/lib/krb5/posix/syslog.c b/src/lib/krb5/posix/syslog.c index f7ddbff16..3fff34e42 100644 --- a/src/lib/krb5/posix/syslog.c +++ b/src/lib/krb5/posix/syslog.c @@ -33,9 +33,9 @@ * Modified to use UNIX domain IPC by Ralph Campbell */ -#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh) +#if !defined(_WIN32) && !defined(macintosh) -#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32) +#if defined(__STDC__) || defined(_WIN32) #include <stdarg.h> #else #define const @@ -63,7 +63,7 @@ static int LogFacility = LOG_USER; /* default facility code */ void -#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32) +#if defined(__STDC__) || defined(_WIN32) syslog(int pri, const char *fmt, ...) #else syslog(pri, fmt, va_alist) @@ -74,7 +74,7 @@ syslog(pri, fmt, va_alist) { va_list pvar; void vsyslog(); -#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32) +#if defined(__STDC__) || defined(_WIN32) va_start(pvar, fmt); #else va_start(pvar); @@ -244,7 +244,7 @@ setlogmask(pmask) LogMask = pmask; return (omask); } -#else /* _MSDOS */ +#else /* Windows or Mac */ /* Windows doesn't have the concept of a system log, so just ** do nothing here. diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index 8946bc3ee..23c28a3f0 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,9 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * rc_io.c: Drop _MSDOS support. + + * rcfns.c: Don't explicitly declare pointers FAR any more. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> * ser_rc.c: Don't use KRB5_DLLIMP. diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c index 57fa92961..8cbd6fc82 100644 --- a/src/lib/krb5/rcache/rc_io.c +++ b/src/lib/krb5/rcache/rc_io.c @@ -11,7 +11,7 @@ * I/O functions for the replay cache default implementation. */ -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) # define PATH_SEPARATOR "\\" #else # define PATH_SEPARATOR "/" @@ -59,7 +59,7 @@ static void getdir() { if (!(dir = getenv("KRB5RCACHEDIR"))) { -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) if (!(dir = getenv("TEMP"))) if (!(dir = getenv("TMP"))) dir = "C:"; @@ -275,7 +275,7 @@ krb5_error_code krb5_rc_io_move(krb5_context context, krb5_rc_iostuff *new, krb5_rc_iostuff *old) { -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) char *new_fn = NULL; char *old_fn = NULL; off_t offset = 0; @@ -373,7 +373,7 @@ krb5_rc_io_write(krb5_context context, krb5_rc_iostuff *d, krb5_pointer buf, krb5_error_code krb5_rc_io_sync(krb5_context context, krb5_rc_iostuff *d) { -#if defined(_MSDOS) || defined(_WIN32) +#if defined(_WIN32) #ifndef fsync #define fsync _commit #endif diff --git a/src/lib/krb5/rcache/rcfns.c b/src/lib/krb5/rcache/rcfns.c index c19753df7..a98fdd034 100644 --- a/src/lib/krb5/rcache/rcfns.c +++ b/src/lib/krb5/rcache/rcfns.c @@ -56,7 +56,7 @@ krb5_rc_close (krb5_context context, krb5_rcache id) krb5_error_code KRB5_CALLCONV krb5_rc_store (krb5_context context, krb5_rcache id, - krb5_donot_replay FAR *dontreplay) + krb5_donot_replay *dontreplay) { return krb5_x((id)->ops->store,(context, id, dontreplay)); } @@ -69,19 +69,19 @@ krb5_rc_expunge (krb5_context context, krb5_rcache id) krb5_error_code KRB5_CALLCONV krb5_rc_get_lifespan (krb5_context context, krb5_rcache id, - krb5_deltat FAR *spanp) + krb5_deltat *spanp) { return krb5_x((id)->ops->get_span,(context, id, spanp)); } -char FAR *KRB5_CALLCONV +char *KRB5_CALLCONV krb5_rc_get_name (krb5_context context, krb5_rcache id) { return krb5_xc((id)->ops->get_name,(context, id)); } krb5_error_code KRB5_CALLCONV -krb5_rc_resolve (krb5_context context, krb5_rcache id, char FAR *name) +krb5_rc_resolve (krb5_context context, krb5_rcache id, char *name) { return krb5_x((id)->ops->resolve,(context, id, name)); } diff --git a/src/lib/krb5util/ChangeLog b/src/lib/krb5util/ChangeLog index 5f6784123..db3dc5eaf 100644 --- a/src/lib/krb5util/ChangeLog +++ b/src/lib/krb5util/ChangeLog @@ -1,3 +1,7 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * compat_recv.c: Drop _MSDOS support. + 2001-06-26 Ezra Peisach <epeisach@mit.edu> * compat_recv.c: Flush out prototype for static krb_v4_recvauth. diff --git a/src/lib/krb5util/compat_recv.c b/src/lib/krb5util/compat_recv.c index 681f7c04e..c8e9f05c8 100644 --- a/src/lib/krb5util/compat_recv.c +++ b/src/lib/krb5util/compat_recv.c @@ -38,7 +38,7 @@ #define NEED_SOCKETS #include "k5-int.h" -#if !defined(_MSDOS) && !defined(_MACINTOSH) +#if !defined(_MACINTOSH) #include <kerberosIV/krb.h> #include "com_err.h" #include <errno.h> diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog index d48cc888b..f829ce764 100644 --- a/src/lib/rpc/ChangeLog +++ b/src/lib/rpc/ChangeLog @@ -1,3 +1,7 @@ +2001-10-05 Ken Raeburn <raeburn@mit.edu> + + * auth_gssapi.h, getrpcent.c, xdr.h: Drop _MSDOS support. + 2001-08-10 <epeisach@mit.edu> * clnt_udp.c (clntudp_call): Do not assume that select will not diff --git a/src/lib/rpc/auth_gssapi.h b/src/lib/rpc/auth_gssapi.h index fe2bd9797..3f5c030d6 100644 --- a/src/lib/rpc/auth_gssapi.h +++ b/src/lib/rpc/auth_gssapi.h @@ -27,7 +27,7 @@ * Make sure we have a definition for PROTOTYPE. */ #if !defined(PROTOTYPE) -#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32) || defined(__ultrix) +#if defined(__STDC__) || defined(_WIN32) || defined(__ultrix) #define PROTOTYPE(x) x #else #define PROTOTYPE(x) () diff --git a/src/lib/rpc/getrpcent.c b/src/lib/rpc/getrpcent.c index ed674c085..1b22b530d 100644 --- a/src/lib/rpc/getrpcent.c +++ b/src/lib/rpc/getrpcent.c @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)getrpcent.c 1.9 87/08/11 Copyr 1984 Sun Micro"; * Make sure we have a definition for PROTOTYPE. */ #if !defined(PROTOTYPE) -#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32) || defined(__ultrix) +#if defined(__STDC__) || defined(_WIN32) || defined(__ultrix) #define PROTOTYPE(x) x #else #define PROTOTYPE(x) () diff --git a/src/lib/rpc/xdr.h b/src/lib/rpc/xdr.h index fe6551d6f..b94984dc7 100644 --- a/src/lib/rpc/xdr.h +++ b/src/lib/rpc/xdr.h @@ -45,7 +45,7 @@ * Make sure we have a definition for PROTOTYPE. */ #if !defined(PROTOTYPE) -#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32) || defined(__ultrix) +#if defined(__STDC__) || defined(_WIN32) || defined(__ultrix) #define PROTOTYPE(x) x #else #define PROTOTYPE(x) () diff --git a/src/lib/win_glue.c b/src/lib/win_glue.c index 6dc9e1014..6fe7b9513 100644 --- a/src/lib/win_glue.c +++ b/src/lib/win_glue.c @@ -101,7 +101,7 @@ void GetCallingAppVerInfo( char *AppTitle, char *AppVer, char *AppIni, BOOL *VSflag) { char CallerFilename[_MAX_PATH]; - LONG FAR *lpLangInfo; + LONG *lpLangInfo; DWORD hVersionInfoID, size; GLOBALHANDLE hVersionInfo; LPSTR lpVersionInfo; @@ -158,7 +158,7 @@ void GetCallingAppVerInfo( char *AppTitle, char *AppVer, char *AppIni, lpVersionInfo); retval = VerQueryValue(lpVersionInfo, "\\VarFileInfo\\Translation", - (LPSTR FAR *)&lpLangInfo, &dumint); + (LPSTR *)&lpLangInfo, &dumint); wsprintf(szVerQ, "\\StringFileInfo\\%04x%04x\\", LOWORD(*lpLangInfo), HIWORD(*lpLangInfo)); @@ -221,10 +221,10 @@ void GetCallingAppVerInfo( char *AppTitle, char *AppVer, char *AppIni, * We're going to test track as well */ static int CallVersionServer(app_title, app_version, app_ini, code_cover) - char FAR *app_title; - char FAR *app_version; - char FAR *app_ini; - char FAR *code_cover; + char *app_title; + char *app_version; + char *app_ini; + char *code_cover; { VS_Request vrequest; VS_Status vstatus; @@ -366,7 +366,7 @@ HINSTANCE get_lib_instance() static int control(int mode) { - void ((KRB5_CALLCONV *et_func)(struct error_table FAR *)); + void ((KRB5_CALLCONV *et_func)(struct error_table *)); #ifdef NEED_WINSOCK WORD wVersionRequested; WSADATA wsaData; |