diff options
| author | Luke Howard <lukeh@padl.com> | 2009-10-20 14:14:46 +0000 |
|---|---|---|
| committer | Luke Howard <lukeh@padl.com> | 2009-10-20 14:14:46 +0000 |
| commit | c70a5455e4dab71f0b8d956c415a5005368cfc5c (patch) | |
| tree | ba31bbb368a9b9479bed7dec8465073c5f7869a3 | |
| parent | f123aef054e9091a95a64d53fd44f8bfe87cd85a (diff) | |
| download | krb5-c70a5455e4dab71f0b8d956c415a5005368cfc5c.tar.gz krb5-c70a5455e4dab71f0b8d956c415a5005368cfc5c.tar.xz krb5-c70a5455e4dab71f0b8d956c415a5005368cfc5c.zip | |
use ANSI prototypes for acquire_XXX_cred, and fix cast to calling acquire_accept_cred()
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22955 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/gssapi/krb5/acquire_cred.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c index 8f8cf1e2c..9e714059e 100644 --- a/src/lib/gssapi/krb5/acquire_cred.c +++ b/src/lib/gssapi/krb5/acquire_cred.c @@ -138,12 +138,11 @@ gss_krb5int_register_acceptor_identity(OM_uint32 *minor_status, */ static OM_uint32 -acquire_accept_cred(context, minor_status, desired_name, output_name, cred) - krb5_context context; - OM_uint32 *minor_status; - krb5_gss_name_t desired_name; - krb5_gss_name_t *output_name; - krb5_gss_cred_id_rec *cred; +acquire_accept_cred(krb5_context context, + OM_uint32 *minor_status, + krb5_gss_name_t desired_name, + krb5_gss_name_t *output_name, + krb5_gss_cred_id_rec *cred) { krb5_error_code code; krb5_principal princ; @@ -219,12 +218,11 @@ acquire_accept_cred(context, minor_status, desired_name, output_name, cred) */ static OM_uint32 -acquire_init_cred(context, minor_status, desired_name, output_name, cred) - krb5_context context; - OM_uint32 *minor_status; - krb5_gss_name_t desired_name; - krb5_gss_name_t *output_name; - krb5_gss_cred_id_rec *cred; +acquire_init_cred(krb5_context context, + OM_uint32 *minor_status, + krb5_gss_name_t desired_name, + krb5_gss_name_t *output_name, + krb5_gss_cred_id_rec *cred) { krb5_error_code code; krb5_ccache ccache; @@ -571,8 +569,9 @@ krb5_gss_acquire_cred(minor_status, desired_name, time_req, #ifndef LEAN_CLIENT if ((cred_usage == GSS_C_ACCEPT) || (cred_usage == GSS_C_BOTH)) - if ((ret = acquire_accept_cred(context, minor_status, desired_name, - &(cred->name), cred)) + if ((ret = acquire_accept_cred(context, minor_status, + (krb5_gss_name_t)desired_name, + &cred->name, cred)) != GSS_S_COMPLETE) { if (cred->name) kg_release_name(context, 0, &cred->name); |