From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 4 Aug 2004 06:59:37 +0000 (+0000)
Subject: * srv_rcache.c (krb5_get_server_rcache): Call krb5_rc_recover_or_initialize
X-Git-Tag: krb5-1.4-beta1~167
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19461d855f3a5fa11e9950d66e4f1e9ec3de8da0;p=krb5.git

* srv_rcache.c (krb5_get_server_rcache): Call krb5_rc_recover_or_initialize

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16641 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index acad5724c..9d508e895 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-03  Ken Raeburn  <raeburn@mit.edu>
+
+	* srv_rcache.c (krb5_get_server_rcache): Call
+	krb5_rc_recover_or_initialize.
+
 2004-06-22  Ken Raeburn  <raeburn@mit.edu>
 
 	* parse.c (krb5_parse_name): Don't test macintosh.
diff --git a/src/lib/krb5/krb/srv_rcache.c b/src/lib/krb5/krb/srv_rcache.c
index c78a235ba..898b3f687 100644
--- a/src/lib/krb5/krb/srv_rcache.c
+++ b/src/lib/krb5/krb/srv_rcache.c
@@ -112,13 +112,11 @@ krb5_get_server_rcache(krb5_context context, const krb5_data *piece,
      * First try to recover the replay cache; if that doesn't work,
      * initialize it.
      */
-    if (krb5_rc_recover(context, rcache)) {
-	if ((retval = krb5_rc_initialize(context, rcache,
-					 context->clockskew))) {
-	    krb5_rc_close(context, rcache);
-	    rcache = 0;
-	    goto cleanup;
-	}
+    retval = krb5_rc_recover_or_initialize(context, rcache, context->clockskew);
+    if (retval) {
+	krb5_rc_close(context, rcache);
+	rcache = 0;
+	goto cleanup;
     }
 
     *rcptr = rcache;