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

gssapi: ntlm mech should use _gss_ntlm_copy_cred() to dup cred

Browse Source
This commit is contained in:
Luke Howard
2019-01-02 16:44:12 +11:00
committed by Nico Williams
parent e787bd1bc1
commit 57df2ff1cc
2 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/gssapi/ntlm/duplicate_cred.c
View File

@@ -49,25 +49,9 @@ _gss_ntlm_duplicate_cred(OM_uint32 *minor_status,
NULL); NULL);
*output_cred_handle = GSS_C_NO_CREDENTIAL; *output_cred_handle = GSS_C_NO_CREDENTIAL;
if ((new_cred = calloc(1, sizeof(*new_cred))) == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
new_cred->usage = cred->usage;
new_cred->username = strdup(cred->username);
new_cred->domain = strdup(cred->domain);
new_cred->key.data = malloc(cred->key.length);
if (new_cred->username == NULL || new_cred->domain == NULL ||
new_cred->key.data == NULL) {
*output_cred_handle = (gss_cred_id_t) new_cred;
_gss_ntlm_release_cred(&junk, output_cred_handle);
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
memcpy(new_cred->key.data, cred->key.data, cred->key.length); *minor_status = _gss_ntlm_copy_cred((ntlm_cred)input_cred_handle,
new_cred->key.length = cred->key.length; (ntlm_cred *)output_cred_handle);
*output_cred_handle = (gss_cred_id_t) new_cred;
return GSS_S_COMPLETE; return *minor_status == 0 ? GSS_S_COMPLETE : GSS_S_FAILURE;
} }

7
lib/gssapi/ntlm/init_sec_context.c
View File

@@ -215,12 +215,13 @@ _gss_ntlm_get_user_cred(const ntlm_name target_name,
return ret; return ret;
} }
static int int
_gss_copy_cred(ntlm_cred from, ntlm_cred *to) _gss_ntlm_copy_cred(ntlm_cred from, ntlm_cred *to)
{ {
*to = calloc(1, sizeof(**to)); *to = calloc(1, sizeof(**to));
if (*to == NULL) if (*to == NULL)
return ENOMEM; return ENOMEM;
(*to)->usage = from->usage;
(*to)->username = strdup(from->username); (*to)->username = strdup(from->username);
if ((*to)->username == NULL) { if ((*to)->username == NULL) {
free(*to); free(*to);
@@ -289,7 +290,7 @@ _gss_ntlm_init_sec_context
if (initiator_cred_handle != GSS_C_NO_CREDENTIAL) { if (initiator_cred_handle != GSS_C_NO_CREDENTIAL) {
ntlm_cred cred = (ntlm_cred)initiator_cred_handle; ntlm_cred cred = (ntlm_cred)initiator_cred_handle;
ret = _gss_copy_cred(cred, &ctx->client); ret = _gss_ntlm_copy_cred(cred, &ctx->client);
} else } else
ret = _gss_ntlm_get_user_cred(name, &ctx->client); ret = _gss_ntlm_get_user_cred(name, &ctx->client);