diff options
Diffstat (limited to 'src/lib/krb5/krb')
45 files changed, 245 insertions, 244 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 1c73fa4..65d9b6e 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 14f91e4..ac41ef3 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 9ce0459..cc4d6b8 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 3355439..0e3cd23 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 4239c35..5c1853c 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 5310351..667da47 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 62c5af3..e421d90 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 f0aba10..cd4abcc 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 971000f..0507c27 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 2a21488..a8b2279 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 96d8896..9a5fa13 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 6051ecb..d85bedc 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 0934b12..d83d07a 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 7fcf618..c8b35d4 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 057c136..c71909a 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 22f2408..9dd9e11 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 b3b89d1..0455be4 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 04bc511..0a8f690 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 f6678bb..cb9c41e 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 4773c29..b494f11 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 754b8ce..0ca1e7e 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 5f8c03f..7fb025f 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 a87ac7b..da7d294 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 b45f3de..6198816 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 4a88584..bd9519e 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 2e2d748..13ad619 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 f0d124e..ad3e7cc 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 a5e1ffb..340b481 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 29238b8..8b7b5bb 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 ffd530e..eef7120 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 0d1b9db..6aded40 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 54f6a95..730d25c 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 2852e49..dc8d442 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 0431fd1..aca18de 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 274d084..f4adea7 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 14a60b8..f6202df 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 0c4a605..0e64f96 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 7cb7b11..a7f87b2 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 8f81f72..e7b1357 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..0cf0aa6 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 9b80eae..968a0ce 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 f60cf9f5..5324e19 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 2a48b2d..8296157 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 51b4978..12755d9 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 3305888..91da7b9 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; |