[29788] in CVS-changelog-for-Kerberos-V5
krb5 commit: Simplify gss_krb5int_copy_ccache()
daemon@ATHENA.MIT.EDU (Greg Hudson)
Tue Dec 13 13:16:21 2016
Date: Tue, 13 Dec 2016 13:16:16 -0500
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201612131816.uBDIGGBM018582@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/b8acba5a74cc82a46363c03e0fff81be3e21fc37
commit b8acba5a74cc82a46363c03e0fff81be3e21fc37
Author: Andreas Schneider <asn@samba.org>
Date: Mon Dec 12 16:51:53 2016 +0100
Simplify gss_krb5int_copy_ccache()
Use krb5_cc_copy_creds() to reduce the amount of code in
gss_krb5int_copy_ccache().
src/lib/gssapi/krb5/copy_ccache.c | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/src/lib/gssapi/krb5/copy_ccache.c b/src/lib/gssapi/krb5/copy_ccache.c
index f3d7666..027ed48 100644
--- a/src/lib/gssapi/krb5/copy_ccache.c
+++ b/src/lib/gssapi/krb5/copy_ccache.c
@@ -8,8 +8,6 @@ gss_krb5int_copy_ccache(OM_uint32 *minor_status,
const gss_buffer_t value)
{
krb5_gss_cred_id_t k5creds;
- krb5_cc_cursor cursor;
- krb5_creds creds;
krb5_error_code code;
krb5_context context;
krb5_ccache out_ccache;
@@ -37,7 +35,7 @@ gss_krb5int_copy_ccache(OM_uint32 *minor_status,
return GSS_S_FAILURE;
}
- code = krb5_cc_start_seq_get(context, k5creds->ccache, &cursor);
+ code = krb5_cc_copy_creds(context, k5creds->ccache, out_ccache);
if (code) {
k5_mutex_unlock(&k5creds->lock);
*minor_status = code;
@@ -45,12 +43,6 @@ gss_krb5int_copy_ccache(OM_uint32 *minor_status,
krb5_free_context(context);
return(GSS_S_FAILURE);
}
- while (!code && !krb5_cc_next_cred(context, k5creds->ccache, &cursor,
- &creds)) {
- code = krb5_cc_store_cred(context, out_ccache, &creds);
- krb5_free_cred_contents(context, &creds);
- }
- krb5_cc_end_seq_get(context, k5creds->ccache, &cursor);
k5_mutex_unlock(&k5creds->lock);
*minor_status = code;
if (code)
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
