oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(init_init_creds_ctx): make void since it doesn't return an error,

Browse Source 
update call sites
(krb5_get_init_creds_keytab): add out label again


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12874 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-09-18 22:20:50 +00:00
parent 21554e0cbb
commit 332e117688
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/krb5/init_creds_pw.c
View File

@@ -77,7 +77,7 @@ default_s2k_func(krb5_context context, krb5_enctype type,
return ret; return ret;
} }
static krb5_error_code static void
init_init_creds_ctx(krb5_context context, init_init_creds_ctx(krb5_context context,
krb5_get_init_creds_ctx *ctx, krb5_get_init_creds_ctx *ctx,
const char *in_tkt_service, const char *in_tkt_service,
@@ -98,10 +98,6 @@ init_init_creds_ctx(krb5_context context,
ctx->etypes = NULL; ctx->etypes = NULL;
ctx->pre_auth_types = NULL; ctx->pre_auth_types = NULL;
ctx->in_tkt_service = in_tkt_service; ctx->in_tkt_service = in_tkt_service;
memset(&ctx->as_req, 0, sizeof(ctx->as_req));
return 0;
} }
static void static void
@@ -476,9 +472,7 @@ krb5_get_init_creds_keytab(krb5_context context,
krb5_error_code ret; krb5_error_code ret;
krb5_keytab_key_proc_args *a; krb5_keytab_key_proc_args *a;
ret = init_init_creds_ctx(context, &ctx, in_tkt_service, options); init_init_creds_ctx(context, &ctx, in_tkt_service, options);
if (ret)
goto out;
ret = get_init_creds_common(context, creds, client, start_time, ret = get_init_creds_common(context, creds, client, start_time,
ctx.in_tkt_service, ctx.in_tkt_service,
@@ -515,6 +509,7 @@ krb5_get_init_creds_keytab(krb5_context context,
else else
krb5_free_creds_contents (context, &ctx.cred); krb5_free_creds_contents (context, &ctx.cred);
out:
free_init_creds_ctx(context, &ctx); free_init_creds_ctx(context, &ctx);
return ret; return ret;
} }
@@ -1244,9 +1239,7 @@ krb5_get_init_creds(krb5_context context,
memset(&kdc_reply, 0, sizeof(kdc_reply)); memset(&kdc_reply, 0, sizeof(kdc_reply));
ret = init_init_creds_ctx(context, &ctx, in_tkt_service, options); init_init_creds_ctx(context, &ctx, in_tkt_service, options);
if (ret)
goto out;
ret = get_init_creds_common(context, creds, client, start_time, ret = get_init_creds_common(context, creds, client, start_time,
ctx.in_tkt_service, ctx.in_tkt_service,