svn rev #24988: trunk/src/ include/krb5/ lib/krb5/ccache/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24988
Commit By: ghudson
Log Message:
Don't destroy dst on error in krb5_cc_move.

Although destroying any partial contents of dst on error isn't a bad
idea, invalidating the handle would be an incompatible change.  So
revert that part of r24754.


Changed Files:
U   trunk/src/include/krb5/krb5.hin
U   trunk/src/lib/krb5/ccache/ccbase.c
Modified: trunk/src/include/krb5/krb5.hin
===================================================================
--- trunk/src/include/krb5/krb5.hin	2011-06-23 19:26:01 UTC (rev 24987)
+++ trunk/src/include/krb5/krb5.hin	2011-06-23 19:50:04 UTC (rev 24988)
@@ -2142,7 +2142,7 @@
  * @retval
  * 0 Success; @a src is closed.
  * @return
- * Kerberos error codes; @a src is still allocated, while @a dst is closed.
+ * Kerberos error codes; @a src is still allocated.
  */
 krb5_error_code KRB5_CALLCONV
 krb5_cc_move(krb5_context context, krb5_ccache src, krb5_ccache dst);

Modified: trunk/src/lib/krb5/ccache/ccbase.c
===================================================================
--- trunk/src/lib/krb5/ccache/ccbase.c	2011-06-23 19:26:01 UTC (rev 24987)
+++ trunk/src/lib/krb5/ccache/ccbase.c	2011-06-23 19:50:04 UTC (rev 24988)
@@ -401,8 +401,6 @@
     krb5_cc_unlock(context, src);
     if (!ret) {
         ret = krb5_cc_destroy(context, src);
-    } else {
-        ret = krb5_cc_destroy(context, dst);
     }
     krb5_cccol_unlock(context);
     if (princ) {