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

fold init_init_creds_ctx into get_init_creds_common

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14338 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-11-09 16:10:57 +00:00
parent fb7b2586bc
commit fbd7b2787a
1 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/krb5/init_creds_pw.c
View File

@@ -83,33 +83,6 @@ default_s2k_func(krb5_context context, krb5_enctype type,
return ret; return ret;
} }
static void
init_init_creds_ctx(krb5_context context,
krb5_get_init_creds_ctx *ctx,
const char *in_tkt_service,
const krb5_get_init_creds_opt *init_cred_opts)
{
memset(ctx, 0, sizeof(*ctx));
if (init_cred_opts->private) {
ctx->password = init_cred_opts->private->password;
ctx->key_proc = init_cred_opts->private->key_proc;
ctx->req_pac = init_cred_opts->private->req_pac;
ctx->pk_init_ctx = init_cred_opts->private->pk_init_ctx;
} else
ctx->req_pac = KRB5_PA_PAC_DONT_CARE;
if (ctx->key_proc == NULL)
ctx->key_proc = default_s2k_func;
ctx->pre_auth_types = NULL;
ctx->flags.i = 0;
ctx->addrs = NULL;
ctx->etypes = NULL;
ctx->pre_auth_types = NULL;
ctx->in_tkt_service = in_tkt_service;
}
static void static void
free_init_creds_ctx(krb5_context context, krb5_get_init_creds_ctx *ctx) free_init_creds_ctx(krb5_context context, krb5_get_init_creds_ctx *ctx)
{ {
@@ -294,11 +267,31 @@ get_init_creds_common(krb5_context context,
krb5_enctype *etypes; krb5_enctype *etypes;
krb5_preauthtype *pre_auth_types; krb5_preauthtype *pre_auth_types;
memset(ctx, 0, sizeof(*ctx));
if (options == NULL) { if (options == NULL) {
krb5_get_init_creds_opt_init (&default_opt); krb5_get_init_creds_opt_init (&default_opt);
options = &default_opt; options = &default_opt;
} }
if (options->private) {
ctx->password = options->private->password;
ctx->key_proc = options->private->key_proc;
ctx->req_pac = options->private->req_pac;
ctx->pk_init_ctx = options->private->pk_init_ctx;
} else
ctx->req_pac = KRB5_PA_PAC_DONT_CARE;
if (ctx->key_proc == NULL)
ctx->key_proc = default_s2k_func;
ctx->pre_auth_types = NULL;
ctx->flags.i = 0;
ctx->addrs = NULL;
ctx->etypes = NULL;
ctx->pre_auth_types = NULL;
ctx->in_tkt_service = in_tkt_service;
ret = init_cred (context, &ctx->cred, client, start_time, ret = init_cred (context, &ctx->cred, client, start_time,
in_tkt_service, options); in_tkt_service, options);
if (ret) if (ret)
@@ -478,12 +471,10 @@ krb5_get_init_creds_keytab(krb5_context context,
const char *in_tkt_service, const char *in_tkt_service,
krb5_get_init_creds_opt *options) krb5_get_init_creds_opt *options)
{ {
struct krb5_get_init_creds_ctx ctx; krb5_get_init_creds_ctx ctx;
krb5_error_code ret; krb5_error_code ret;
krb5_keytab_key_proc_args *a; krb5_keytab_key_proc_args *a;
init_init_creds_ctx(context, &ctx, in_tkt_service, options);
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,
options, options,
@@ -1368,10 +1359,8 @@ krb5_get_init_creds(krb5_context context,
memset(&kdc_reply, 0, sizeof(kdc_reply)); memset(&kdc_reply, 0, sizeof(kdc_reply));
init_init_creds_ctx(context, &ctx, in_tkt_service, options);
ret = get_init_creds_common(context, creds, client, start_time, ret = get_init_creds_common(context, creds, client, start_time,
ctx.in_tkt_service, in_tkt_service,
options, options,
&ctx); &ctx);
if (ret) if (ret)