pull up r18286 from trunk

 r18286@cathode-dark-space:  tlyu | 2006-06-30 01:59:46 -0400
 ticket: 3962

 	* src/lib/krb5/krb/srv_rcache.c (krb5_get_server_rcache):
 	Oops, krb5_rc_close actually does free rcache, so actually do null
 	rcache on error from krb5_rc_recover_or_initialize.  Thanks to
 	Shawn Emery for noticing.

ticket: 3962

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-5@18290 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/srv_rcache.c b/src/lib/krb5/krb/srv_rcache.c
index dc36827574bf1ab0014b6cfd1cf6258bcd647261..f88df5ee5fb68d93918223d8580f1528261e68ba 100644 (file)
--- a/src/lib/krb5/krb/srv_rcache.c
+++ b/src/lib/krb5/krb/srv_rcache.c
@@ -117,6 +117,7 @@ krb5_get_server_rcache(krb5_context context, const krb5_data *piece,
     retval = krb5_rc_recover_or_initialize(context, rcache, context->clockskew);
     if (retval) {
        krb5_rc_close(context, rcache);
+       rcache = 0;
        goto cleanup;
     }