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

Make krb5_get_init_creds_opt_free take a context argument.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19078 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-11-20 18:12:41 +00:00
parent ebc7f63d48
commit ece5f9603e
13 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appl/gssmask/gssmask.c
View File

@@ -548,7 +548,7 @@ out:
"AcquireCreds handle: %d return code: %d", handle, gsm_error); "AcquireCreds handle: %d return code: %d", handle, gsm_error);
if (opt) if (opt)
krb5_get_init_creds_opt_free (opt); krb5_get_init_creds_opt_free (context, opt);
if (principal) if (principal)
krb5_free_principal(context, principal); krb5_free_principal(context, principal);
free(name); free(name);

2
appl/popper/pop_pass.c
View File

@@ -76,7 +76,7 @@ krb5_verify_password (POP *p)
0, 0,
NULL, NULL,
get_options); get_options);
krb5_get_init_creds_opt_free(get_options); krb5_get_init_creds_opt_free(p->context, get_options);
if (ret) { if (ret) {
pop_log(p, POP_PRIORITY, pop_log(p, POP_PRIORITY,
"krb5_get_init_creds_password: %s", "krb5_get_init_creds_password: %s",

2
kdc/hprop.c
View File

@@ -499,7 +499,7 @@ get_creds(krb5_context context, krb5_ccache *cache)
ret = krb5_get_init_creds_keytab(context, &creds, client, keytab, 0, NULL, init_opts); ret = krb5_get_init_creds_keytab(context, &creds, client, keytab, 0, NULL, init_opts);
if(ret) krb5_err(context, 1, ret, "krb5_get_init_creds"); if(ret) krb5_err(context, 1, ret, "krb5_get_init_creds");
krb5_get_init_creds_opt_free(init_opts); krb5_get_init_creds_opt_free(context, init_opts);
ret = krb5_kt_close(context, keytab); ret = krb5_kt_close(context, keytab);
if(ret) krb5_err(context, 1, ret, "krb5_kt_close"); if(ret) krb5_err(context, 1, ret, "krb5_kt_close");

2
kpasswd/kpasswd-generator.c
View File

@@ -151,7 +151,7 @@ generate_requests (const char *filename, unsigned nreq)
free (old_pwd); free (old_pwd);
free (new_pwd); free (new_pwd);
krb5_free_cred_contents (context, &cred); krb5_free_cred_contents (context, &cred);
krb5_get_init_creds_opt_free(opt); krb5_get_init_creds_opt_free(context, opt);
} }
} }

2
kpasswd/kpasswd.c
View File

@@ -199,7 +199,7 @@ main (int argc, char **argv)
krb5_err(context, 1, ret, "krb5_get_init_creds"); krb5_err(context, 1, ret, "krb5_get_init_creds");
} }
krb5_get_init_creds_opt_free(opt); krb5_get_init_creds_opt_free(context, opt);
ret = krb5_cc_initialize(context, id, admin_principal); ret = krb5_cc_initialize(context, id, admin_principal);
krb5_free_principal(context, admin_principal); krb5_free_principal(context, admin_principal);

4
kuser/kinit.c
View File

@@ -599,7 +599,7 @@ get_new_tickets(krb5_context context,
opt); opt);
} else if (!interactive) { } else if (!interactive) {
krb5_warnx(context, "Not interactive, failed to get initial ticket"); krb5_warnx(context, "Not interactive, failed to get initial ticket");
krb5_get_init_creds_opt_free(opt); krb5_get_init_creds_opt_free(context, opt);
return 0; return 0;
} else { } else {
@@ -628,7 +628,7 @@ get_new_tickets(krb5_context context,
server_str, server_str,
opt); opt);
} }
krb5_get_init_creds_opt_free(opt); krb5_get_init_creds_opt_free(context, opt);
#ifdef KRB4 #ifdef KRB4
if (ret == KRB5KRB_AP_ERR_V4_REPLY || ret == KRB5_KDC_UNREACH) { if (ret == KRB5KRB_AP_ERR_V4_REPLY || ret == KRB5_KDC_UNREACH) {
int exit_val; int exit_val;

2
lib/gssapi/krb5/acquire_cred.c
View File

@@ -179,7 +179,7 @@ static OM_uint32 acquire_initiator_cred
goto end; goto end;
kret = krb5_get_init_creds_keytab(context, &cred, kret = krb5_get_init_creds_keytab(context, &cred,
handle->principal, keytab, 0, NULL, opt); handle->principal, keytab, 0, NULL, opt);
krb5_get_init_creds_opt_free(opt); krb5_get_init_creds_opt_free(context, opt);
if (kret) if (kret)
goto end; goto end;
kret = krb5_cc_gen_new(context, &krb5_mcc_ops, kret = krb5_cc_gen_new(context, &krb5_mcc_ops,

4
lib/kadm5/init_c.c
View File

@@ -177,7 +177,7 @@ get_new_cache(krb5_context context,
else else
ret = krb5_kt_resolve(context, keytab, &kt); ret = krb5_kt_resolve(context, keytab, &kt);
if(ret) { if(ret) {
krb5_get_init_creds_opt_free(opt); krb5_get_init_creds_opt_free(context, opt);
return ret; return ret;
} }
ret = krb5_get_init_creds_keytab (context, ret = krb5_get_init_creds_keytab (context,
@@ -199,7 +199,7 @@ get_new_cache(krb5_context context,
server_name, server_name,
opt); opt);
} }
krb5_get_init_creds_opt_free(opt); krb5_get_init_creds_opt_free(context, opt);
switch(ret){ switch(ret){
case 0: case 0:
break; break;

2
lib/kadm5/ipropd_slave.c
View File

@@ -115,7 +115,7 @@ get_creds(krb5_context context, const char *keytab_str,
ret = krb5_get_init_creds_keytab(context, &creds, client, keytab, ret = krb5_get_init_creds_keytab(context, &creds, client, keytab,
0, server, init_opts); 0, server, init_opts);
free (server); free (server);
krb5_get_init_creds_opt_free(init_opts); krb5_get_init_creds_opt_free(context, init_opts);
if(ret) krb5_err(context, 1, ret, "krb5_get_init_creds"); if(ret) krb5_err(context, 1, ret, "krb5_get_init_creds");
ret = krb5_kt_close(context, keytab); ret = krb5_kt_close(context, keytab);

3
lib/krb5/init_creds.c
View File

@@ -130,7 +130,8 @@ _krb5_get_init_creds_opt_set_krb5_error(krb5_context context,
void KRB5_LIB_FUNCTION void KRB5_LIB_FUNCTION
krb5_get_init_creds_opt_free(krb5_get_init_creds_opt *opt) krb5_get_init_creds_opt_free(krb5_context context,
krb5_get_init_creds_opt *opt)
{ {
if (opt->opt_private == NULL) if (opt->opt_private == NULL)
return; return;

8
lib/krb5/init_creds_pw.c
View File

@@ -729,8 +729,8 @@ pa_etype_info2(krb5_context context,
if (e.val[i].salt == NULL) if (e.val[i].salt == NULL)
krb5_free_salt(context, salt); krb5_free_salt(context, salt);
if (ret == 0) { if (ret == 0) {
free_ETYPE_INFO2(&e); free_ETYPE_INFO2(&e);
return paid; return paid;
} }
} }
} }
@@ -1515,7 +1515,7 @@ krb5_get_init_creds_password(krb5_context context,
ret = krb5_get_init_creds_opt_set_pa_password(context, options, ret = krb5_get_init_creds_opt_set_pa_password(context, options,
password, NULL); password, NULL);
if (ret) { if (ret) {
krb5_get_init_creds_opt_free(options); krb5_get_init_creds_opt_free(context, options);
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
return ret; return ret;
} }
@@ -1523,7 +1523,7 @@ krb5_get_init_creds_password(krb5_context context,
ret = krb5_get_init_creds(context, creds, client, prompter, ret = krb5_get_init_creds(context, creds, client, prompter,
data, start_time, in_tkt_service, options); data, start_time, in_tkt_service, options);
krb5_get_init_creds_opt_free(options); krb5_get_init_creds_opt_free(context, options);
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
return ret; return ret;
} }

1
lib/krb5/krb5_get_init_creds.3
View File

@@ -72,6 +72,7 @@ Kerberos 5 Library (libkrb5, -lkrb5)
.Fc .Fc
.Ft void .Ft void
.Fo krb5_get_init_creds_opt_free .Fo krb5_get_init_creds_opt_free
.Fa "krb5_context context"
.Fa "krb5_get_init_creds_opt *opt" .Fa "krb5_get_init_creds_opt *opt"
.Fc .Fc
.Ft void .Ft void

2
lib/krb5/verify_user.c
View File

@@ -172,7 +172,7 @@ verify_user_opt_int(krb5_context context,
0, 0,
NULL, NULL,
opt); opt);
krb5_get_init_creds_opt_free(opt); krb5_get_init_creds_opt_free(context, opt);
if(ret) if(ret)
return ret; return ret;
#define OPT(V, D) ((vopt && (vopt->V)) ? (vopt->V) : (D)) #define OPT(V, D) ((vopt && (vopt->V)) ? (vopt->V) : (D))