krb5 commit: Simplify gss_krb5int_copy_ccache()

Greg Hudson ghudson at mit.edu
Tue Dec 13 13:16:16 EST 2016


https://github.com/krb5/krb5/commit/b8acba5a74cc82a46363c03e0fff81be3e21fc37
commit b8acba5a74cc82a46363c03e0fff81be3e21fc37
Author: Andreas Schneider <asn at 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)


More information about the cvs-krb5 mailing list