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

(gss_acquire_cred): remove memory leaks. from Jason R Thorpe <thorpej@zembu.com>

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9740 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-03-12 02:25:49 +00:00
parent 7d5e24cc9e
commit db65084e93
2 changed files with 152 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
lib/gssapi/acquire_cred.c
View File

@@ -48,95 +48,114 @@ OM_uint32 gss_acquire_cred
{ {
gss_cred_id_t handle; gss_cred_id_t handle;
OM_uint32 ret; OM_uint32 ret;
krb5_principal def_princ; krb5_error_code kret = 0;
krb5_ccache ccache; krb5_ccache ccache;
krb5_error_code pret = -1, kret = 0;
krb5_keytab kt;
krb5_creds cred;
krb5_get_init_creds_opt opt;
handle = (gss_cred_id_t)malloc(sizeof(*handle)); handle = (gss_cred_id_t)malloc(sizeof(*handle));
if (handle == GSS_C_NO_CREDENTIAL) { if (handle == GSS_C_NO_CREDENTIAL)
return GSS_S_FAILURE; return GSS_S_FAILURE;
}
memset(handle, 0, sizeof (*handle)); memset(handle, 0, sizeof (*handle));
ret = gss_duplicate_name(minor_status, desired_name, &handle->principal); ret = gss_duplicate_name(minor_status, desired_name, &handle->principal);
if (ret) { if (ret) {
free(handle);
return ret; return ret;
} }
if (krb5_cc_default(gssapi_krb5_context, &ccache) == 0 && if (krb5_cc_default(gssapi_krb5_context, &ccache) == 0) {
(pret = krb5_cc_get_principal(gssapi_krb5_context, ccache, krb5_principal def_princ;
&def_princ)) == 0 &&
krb5_principal_compare(gssapi_krb5_context, handle->principal, if (krb5_cc_get_principal(gssapi_krb5_context, ccache,
def_princ) == TRUE) { &def_princ) != 0) {
krb5_cc_close(gssapi_krb5_context, ccache);
goto try_keytab;
}
if (krb5_principal_compare(gssapi_krb5_context, handle->principal,
def_princ) == FALSE) {
krb5_free_principal(gssapi_krb5_context, def_princ);
krb5_cc_close(gssapi_krb5_context, ccache);
goto try_keytab;
}
handle->ccache = ccache; handle->ccache = ccache;
handle->keytab = NULL; handle->keytab = NULL;
krb5_free_principal(gssapi_krb5_context, def_princ);
} else { } else {
kret = krb5_kt_default(gssapi_krb5_context, &kt); krb5_creds cred;
krb5_get_init_creds_opt opt;
try_keytab:
kret = krb5_kt_default(gssapi_krb5_context, &handle->keytab);
if (kret != 0) if (kret != 0)
goto out; goto krb5_bad;
krb5_get_init_creds_opt_init(&opt); krb5_get_init_creds_opt_init(&opt);
memset(&cred, 0, sizeof(cred)); memset(&cred, 0, sizeof(cred));
kret = krb5_get_init_creds_keytab(gssapi_krb5_context, &cred,
handle->principal, kt, 0, NULL, &opt);
if (kret != 0) {
krb5_kt_close(gssapi_krb5_context, kt);
goto out;
}
kret = krb5_cc_gen_new(gssapi_krb5_context, &krb5_mcc_ops, &ccache);
if (kret != 0) {
krb5_kt_close(gssapi_krb5_context, kt);
goto out;
}
kret = krb5_cc_initialize(gssapi_krb5_context, ccache, cred.client);
if (kret != 0) {
krb5_kt_close(gssapi_krb5_context, kt);
krb5_cc_close(gssapi_krb5_context, ccache);
goto out;
}
kret = krb5_cc_store_cred(gssapi_krb5_context, ccache, &cred);
if (kret != 0) {
krb5_kt_close(gssapi_krb5_context, kt);
krb5_cc_close(gssapi_krb5_context, ccache);
goto out;
}
handle->ccache = ccache;
handle->keytab = kt;
}
kret = krb5_get_init_creds_keytab(gssapi_krb5_context, &cred,
handle->principal, handle->keytab,
0, NULL, &opt);
if (kret != 0)
goto krb5_bad;
kret = krb5_cc_gen_new(gssapi_krb5_context, &krb5_mcc_ops,
&handle->ccache);
if (kret != 0) {
krb5_free_creds_contents(gssapi_krb5_context, &cred);
goto krb5_bad;
}
kret = krb5_cc_initialize(gssapi_krb5_context, handle->ccache,
cred.client);
if (kret != 0) {
krb5_free_creds_contents(gssapi_krb5_context, &cred);
goto krb5_bad;
}
kret = krb5_cc_store_cred(gssapi_krb5_context, handle->ccache, &cred);
if (kret != 0) {
krb5_free_creds_contents(gssapi_krb5_context, &cred);
goto krb5_bad;
}
krb5_free_creds_contents(gssapi_krb5_context, &cred);
}
/* XXX */ /* XXX */
handle->lifetime = time_req; handle->lifetime = time_req;
handle->usage = cred_usage; handle->usage = cred_usage;
ret = gss_create_empty_oid_set(minor_status, &handle->mechanisms); ret = gss_create_empty_oid_set(minor_status, &handle->mechanisms);
if (ret) { if (ret)
return ret; goto gssapi_bad;
}
ret = gss_add_oid_set_member(minor_status, GSS_KRB5_MECHANISM, ret = gss_add_oid_set_member(minor_status, GSS_KRB5_MECHANISM,
&handle->mechanisms); &handle->mechanisms);
if (ret) { if (ret)
return ret; goto gssapi_bad;
}
ret = gss_inquire_cred(minor_status, handle, NULL, time_rec, NULL, ret = gss_inquire_cred(minor_status, handle, NULL, time_rec, NULL,
actual_mechs); actual_mechs);
if (ret) { if (ret)
return ret; goto gssapi_bad;
}
*output_cred_handle = handle; *output_cred_handle = handle;
return (GSS_S_COMPLETE);
out: krb5_bad:
if (pret == 0) ret = GSS_S_FAILURE;
krb5_free_principal(gssapi_krb5_context, def_princ); *minor_status = kret;
if (kret != 0) { gssapi_bad:
*minor_status = kret; krb5_free_principal(gssapi_krb5_context, handle->principal);
return GSS_S_FAILURE; if (handle->ccache != NULL)
} krb5_cc_close(gssapi_krb5_context, handle->ccache);
if (handle->keytab != NULL)
krb5_kt_close(gssapi_krb5_context, handle->keytab);
if (handle->mechanisms != NULL)
gss_release_oid_set(NULL, &handle->mechanisms);
return GSS_S_COMPLETE; free(handle);
return (ret);
} }

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

@@ -48,95 +48,114 @@ OM_uint32 gss_acquire_cred
{ {
gss_cred_id_t handle; gss_cred_id_t handle;
OM_uint32 ret; OM_uint32 ret;
krb5_principal def_princ; krb5_error_code kret = 0;
krb5_ccache ccache; krb5_ccache ccache;
krb5_error_code pret = -1, kret = 0;
krb5_keytab kt;
krb5_creds cred;
krb5_get_init_creds_opt opt;
handle = (gss_cred_id_t)malloc(sizeof(*handle)); handle = (gss_cred_id_t)malloc(sizeof(*handle));
if (handle == GSS_C_NO_CREDENTIAL) { if (handle == GSS_C_NO_CREDENTIAL)
return GSS_S_FAILURE; return GSS_S_FAILURE;
}
memset(handle, 0, sizeof (*handle)); memset(handle, 0, sizeof (*handle));
ret = gss_duplicate_name(minor_status, desired_name, &handle->principal); ret = gss_duplicate_name(minor_status, desired_name, &handle->principal);
if (ret) { if (ret) {
free(handle);
return ret; return ret;
} }
if (krb5_cc_default(gssapi_krb5_context, &ccache) == 0 && if (krb5_cc_default(gssapi_krb5_context, &ccache) == 0) {
(pret = krb5_cc_get_principal(gssapi_krb5_context, ccache, krb5_principal def_princ;
&def_princ)) == 0 &&
krb5_principal_compare(gssapi_krb5_context, handle->principal, if (krb5_cc_get_principal(gssapi_krb5_context, ccache,
def_princ) == TRUE) { &def_princ) != 0) {
krb5_cc_close(gssapi_krb5_context, ccache);
goto try_keytab;
}
if (krb5_principal_compare(gssapi_krb5_context, handle->principal,
def_princ) == FALSE) {
krb5_free_principal(gssapi_krb5_context, def_princ);
krb5_cc_close(gssapi_krb5_context, ccache);
goto try_keytab;
}
handle->ccache = ccache; handle->ccache = ccache;
handle->keytab = NULL; handle->keytab = NULL;
krb5_free_principal(gssapi_krb5_context, def_princ);
} else { } else {
kret = krb5_kt_default(gssapi_krb5_context, &kt); krb5_creds cred;
krb5_get_init_creds_opt opt;
try_keytab:
kret = krb5_kt_default(gssapi_krb5_context, &handle->keytab);
if (kret != 0) if (kret != 0)
goto out; goto krb5_bad;
krb5_get_init_creds_opt_init(&opt); krb5_get_init_creds_opt_init(&opt);
memset(&cred, 0, sizeof(cred)); memset(&cred, 0, sizeof(cred));
kret = krb5_get_init_creds_keytab(gssapi_krb5_context, &cred,
handle->principal, kt, 0, NULL, &opt);
if (kret != 0) {
krb5_kt_close(gssapi_krb5_context, kt);
goto out;
}
kret = krb5_cc_gen_new(gssapi_krb5_context, &krb5_mcc_ops, &ccache);
if (kret != 0) {
krb5_kt_close(gssapi_krb5_context, kt);
goto out;
}
kret = krb5_cc_initialize(gssapi_krb5_context, ccache, cred.client);
if (kret != 0) {
krb5_kt_close(gssapi_krb5_context, kt);
krb5_cc_close(gssapi_krb5_context, ccache);
goto out;
}
kret = krb5_cc_store_cred(gssapi_krb5_context, ccache, &cred);
if (kret != 0) {
krb5_kt_close(gssapi_krb5_context, kt);
krb5_cc_close(gssapi_krb5_context, ccache);
goto out;
}
handle->ccache = ccache;
handle->keytab = kt;
}
kret = krb5_get_init_creds_keytab(gssapi_krb5_context, &cred,
handle->principal, handle->keytab,
0, NULL, &opt);
if (kret != 0)
goto krb5_bad;
kret = krb5_cc_gen_new(gssapi_krb5_context, &krb5_mcc_ops,
&handle->ccache);
if (kret != 0) {
krb5_free_creds_contents(gssapi_krb5_context, &cred);
goto krb5_bad;
}
kret = krb5_cc_initialize(gssapi_krb5_context, handle->ccache,
cred.client);
if (kret != 0) {
krb5_free_creds_contents(gssapi_krb5_context, &cred);
goto krb5_bad;
}
kret = krb5_cc_store_cred(gssapi_krb5_context, handle->ccache, &cred);
if (kret != 0) {
krb5_free_creds_contents(gssapi_krb5_context, &cred);
goto krb5_bad;
}
krb5_free_creds_contents(gssapi_krb5_context, &cred);
}
/* XXX */ /* XXX */
handle->lifetime = time_req; handle->lifetime = time_req;
handle->usage = cred_usage; handle->usage = cred_usage;
ret = gss_create_empty_oid_set(minor_status, &handle->mechanisms); ret = gss_create_empty_oid_set(minor_status, &handle->mechanisms);
if (ret) { if (ret)
return ret; goto gssapi_bad;
}
ret = gss_add_oid_set_member(minor_status, GSS_KRB5_MECHANISM, ret = gss_add_oid_set_member(minor_status, GSS_KRB5_MECHANISM,
&handle->mechanisms); &handle->mechanisms);
if (ret) { if (ret)
return ret; goto gssapi_bad;
}
ret = gss_inquire_cred(minor_status, handle, NULL, time_rec, NULL, ret = gss_inquire_cred(minor_status, handle, NULL, time_rec, NULL,
actual_mechs); actual_mechs);
if (ret) { if (ret)
return ret; goto gssapi_bad;
}
*output_cred_handle = handle; *output_cred_handle = handle;
return (GSS_S_COMPLETE);
out: krb5_bad:
if (pret == 0) ret = GSS_S_FAILURE;
krb5_free_principal(gssapi_krb5_context, def_princ); *minor_status = kret;
if (kret != 0) { gssapi_bad:
*minor_status = kret; krb5_free_principal(gssapi_krb5_context, handle->principal);
return GSS_S_FAILURE; if (handle->ccache != NULL)
} krb5_cc_close(gssapi_krb5_context, handle->ccache);
if (handle->keytab != NULL)
krb5_kt_close(gssapi_krb5_context, handle->keytab);
if (handle->mechanisms != NULL)
gss_release_oid_set(NULL, &handle->mechanisms);
return GSS_S_COMPLETE; free(handle);
return (ret);
} }