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

minimize layering and remove krb5_kdc_flags

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18202 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-02 12:00:59 +00:00
parent e0645d20a6
commit b110e33a3f
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/krb5/init_creds_pw.c
View File

@@ -36,7 +36,7 @@
RCSID("$Id$"); RCSID("$Id$");
typedef struct krb5_get_init_creds_ctx { typedef struct krb5_get_init_creds_ctx {
krb5_kdc_flags flags; KDCOptions flags;
krb5_creds cred; krb5_creds cred;
krb5_addresses *addrs; krb5_addresses *addrs;
krb5_enctype *etypes; krb5_enctype *etypes;
@@ -292,7 +292,6 @@ get_init_creds_common(krb5_context context,
ctx->key_proc = default_s2k_func; ctx->key_proc = default_s2k_func;
ctx->pre_auth_types = NULL; ctx->pre_auth_types = NULL;
ctx->flags.i = 0;
ctx->addrs = NULL; ctx->addrs = NULL;
ctx->etypes = NULL; ctx->etypes = NULL;
ctx->pre_auth_types = NULL; ctx->pre_auth_types = NULL;
@@ -303,18 +302,16 @@ get_init_creds_common(krb5_context context,
if (ret) if (ret)
return ret; return ret;
ctx->flags.i = 0;
if (options->flags & KRB5_GET_INIT_CREDS_OPT_FORWARDABLE) if (options->flags & KRB5_GET_INIT_CREDS_OPT_FORWARDABLE)
ctx->flags.b.forwardable = options->forwardable; ctx->flags.forwardable = options->forwardable;
if (options->flags & KRB5_GET_INIT_CREDS_OPT_PROXIABLE) if (options->flags & KRB5_GET_INIT_CREDS_OPT_PROXIABLE)
ctx->flags.b.proxiable = options->proxiable; ctx->flags.proxiable = options->proxiable;
if (start_time) if (start_time)
ctx->flags.b.postdated = 1; ctx->flags.postdated = 1;
if (ctx->cred.times.renew_till) if (ctx->cred.times.renew_till)
ctx->flags.b.renewable = 1; ctx->flags.renewable = 1;
if (options->flags & KRB5_GET_INIT_CREDS_OPT_ADDRESS_LIST) { if (options->flags & KRB5_GET_INIT_CREDS_OPT_ADDRESS_LIST) {
ctx->addrs = options->address_list; ctx->addrs = options->address_list;
} else if (options->opt_private) { } else if (options->opt_private) {
@@ -361,7 +358,7 @@ get_init_creds_common(krb5_context context,
if (options->flags & KRB5_GET_INIT_CREDS_OPT_SALT) if (options->flags & KRB5_GET_INIT_CREDS_OPT_SALT)
; /* XXX */ ; /* XXX */
if (options->flags & KRB5_GET_INIT_CREDS_OPT_ANONYMOUS) if (options->flags & KRB5_GET_INIT_CREDS_OPT_ANONYMOUS)
ctx->flags.b.request_anonymous = options->anonymous; ctx->flags.request_anonymous = options->anonymous;
return 0; return 0;
} }
@@ -542,7 +539,7 @@ krb5_get_init_creds_keytab(krb5_context context,
static krb5_error_code static krb5_error_code
init_creds_init_as_req (krb5_context context, init_creds_init_as_req (krb5_context context,
krb5_kdc_flags opts, KDCOptions opts,
const krb5_creds *creds, const krb5_creds *creds,
const krb5_addresses *addrs, const krb5_addresses *addrs,
const krb5_enctype *etypes, const krb5_enctype *etypes,
@@ -554,7 +551,7 @@ init_creds_init_as_req (krb5_context context,
a->pvno = 5; a->pvno = 5;
a->msg_type = krb_as_req; a->msg_type = krb_as_req;
a->req_body.kdc_options = opts.b; a->req_body.kdc_options = opts;
a->req_body.cname = malloc(sizeof(*a->req_body.cname)); a->req_body.cname = malloc(sizeof(*a->req_body.cname));
if (a->req_body.cname == NULL) { if (a->req_body.cname == NULL) {
ret = ENOMEM; ret = ENOMEM;
@@ -1357,7 +1354,7 @@ init_cred_loop(krb5_context context,
NULL, NULL,
ctx->nonce, ctx->nonce,
FALSE, FALSE,
ctx->flags.b.request_anonymous, ctx->flags.request_anonymous,
NULL, NULL,
NULL); NULL);
krb5_free_keyblock(context, key); krb5_free_keyblock(context, key);