svn rev #23509: branches/anonymous/src/lib/krb5/krb/

hartmans@MIT.EDU hartmans at MIT.EDU
Wed Dec 23 16:10:49 EST 2009


http://src.mit.edu/fisheye/changelog/krb5/?cs=23509
Commit By: hartmans
Log Message:
Per discussion with Greg and Luke, hold an alias to the out_ccache.
There is some ambiguity in whether it is appropriate for
get_init_creds_opts to hold an alias.  However if it is going to copy
the ccache, we all believe that a duplicate routine in ccfns.c is
preferred.


Changed Files:
U   branches/anonymous/src/lib/krb5/krb/gic_opt.c
Modified: branches/anonymous/src/lib/krb5/krb/gic_opt.c
===================================================================
--- branches/anonymous/src/lib/krb5/krb/gic_opt.c	2009-12-23 21:10:44 UTC (rev 23508)
+++ branches/anonymous/src/lib/krb5/krb/gic_opt.c	2009-12-23 21:10:49 UTC (rev 23509)
@@ -149,8 +149,6 @@
         free_gic_opt_ext_preauth_data(context, opte);
     if (opte->opt_private->fast_ccache_name)
         free(opte->opt_private->fast_ccache_name);
-    if (opte->opt_private->out_ccache)
-        krb5_cc_close(context, opte->opt_private->out_ccache);
     free(opte->opt_private);
     opte->opt_private = NULL;
     return 0;
@@ -501,13 +499,8 @@
                                      "krb5_get_init_creds_opt_set_out_ccache");
     if (retval)
         return retval;
-    if (opte->opt_private->out_ccache) {
-        krb5_cc_close(context,  opte->opt_private->out_ccache);
-        opte->opt_private->out_ccache = NULL;
-    }
-    retval = krb5_cc_resolve(context, krb5_cc_get_name(context, ccache),
-                            &opte->opt_private->out_ccache);
-        return retval;
+    opte->opt_private->out_ccache = ccache;
+    return 0;
 }
 
 krb5_error_code KRB5_CALLCONV




More information about the cvs-krb5 mailing list