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

lib/kerb: verify_user_opt_int pass krb5_creds by ptr verify_common

Browse Source 
Refactor the call to verify_common() to pass the krb5_cred by
pointer to and call krb5_free_cred_contents() in
verify_user_opt_int() instead of verify_common().
This commit is contained in:
Jeffrey Altman
2022-01-17 16:22:56 -05:00
parent b6114c5492
commit 27a2ad7bfc
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/krb5/verify_user.c
View File

@@ -40,7 +40,7 @@ verify_common (krb5_context context,
krb5_keytab keytab, krb5_keytab keytab,
krb5_boolean secure, krb5_boolean secure,
const char *service, const char *service,
krb5_creds cred) krb5_creds *cred)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_principal server; krb5_principal server;
@@ -56,7 +56,7 @@ verify_common (krb5_context context,
krb5_verify_init_creds_opt_set_ap_req_nofail(&vopt, secure); krb5_verify_init_creds_opt_set_ap_req_nofail(&vopt, secure);
ret = krb5_verify_init_creds(context, ret = krb5_verify_init_creds(context,
&cred, cred,
server, server,
keytab, keytab,
NULL, NULL,
@@ -71,12 +71,11 @@ verify_common (krb5_context context,
if(ret == 0){ if(ret == 0){
ret = krb5_cc_initialize(context, id, principal); ret = krb5_cc_initialize(context, id, principal);
if(ret == 0){ if(ret == 0){
ret = krb5_cc_store_cred(context, id, &cred); ret = krb5_cc_store_cred(context, id, cred);
} }
if(ccache == NULL) if(ccache == NULL)
krb5_cc_close(context, id); krb5_cc_close(context, id);
} }
krb5_free_cred_contents(context, &cred);
return ret; return ret;
} }
@@ -172,10 +171,12 @@ verify_user_opt_int(krb5_context context,
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))
return verify_common (context, principal, OPT(ccache, NULL), ret = verify_common (context, principal, OPT(ccache, NULL),
OPT(keytab, NULL), vopt ? vopt->secure : TRUE, OPT(keytab, NULL), vopt ? vopt->secure : TRUE,
OPT(service, "host"), cred); OPT(service, "host"), &cred);
#undef OPT #undef OPT
krb5_free_cred_contents(context, &cred);
return ret;
} }
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL