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

Improve gss_store_cred() for cred sets

Browse Source
This commit is contained in:
Nicolas Williams
2015-04-01 19:28:08 -05:00
parent e0dd26d963
commit d5044abac8
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/gssapi/mech/gss_store_cred.c
View File

@@ -46,6 +46,7 @@ gss_store_cred(OM_uint32 *minor_status,
struct _gss_cred *cred = (struct _gss_cred *) input_cred_handle; struct _gss_cred *cred = (struct _gss_cred *) input_cred_handle;
struct _gss_mechanism_cred *mc; struct _gss_mechanism_cred *mc;
OM_uint32 maj, junk; OM_uint32 maj, junk;
size_t successes = 0;
if (minor_status == NULL) if (minor_status == NULL)
return GSS_S_FAILURE; return GSS_S_FAILURE;
@@ -69,23 +70,30 @@ gss_store_cred(OM_uint32 *minor_status,
if (m == NULL || m->gm_store_cred == NULL) if (m == NULL || m->gm_store_cred == NULL)
continue; continue;
if (desired_mech && !gss_oid_equal(&m->gm_mech_oid, desired_mech)) if (desired_mech != GSS_C_NO_OID &&
!gss_oid_equal(&m->gm_mech_oid, desired_mech))
continue; continue;
maj = (m->gm_store_cred)(minor_status, mc->gmc_cred, maj = (m->gm_store_cred)(minor_status, mc->gmc_cred,
cred_usage, desired_mech, overwrite_cred, cred_usage, desired_mech, overwrite_cred,
default_cred, NULL, cred_usage_stored); default_cred, NULL, cred_usage_stored);
if (maj != GSS_S_COMPLETE) { if (maj == GSS_S_COMPLETE) {
if (elements_stored)
gss_add_oid_set_member(&junk, desired_mech, elements_stored);
successes++;
} else if (desired_mech != GSS_C_NO_OID) {
gss_release_oid_set(&junk, elements_stored); gss_release_oid_set(&junk, elements_stored);
return maj; return maj;
} }
if (elements_stored) {
gss_add_oid_set_member(&junk,
&m->gm_mech_oid,
elements_stored);
} }
if (successes == 0) {
if (maj != GSS_S_COMPLETE)
return maj; /* last failure */
return GSS_S_FAILURE;
} }
*minor_status = 0;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }