* 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 acad5724cab91574bc0947e0bd8429ba0df91df2..9d508e8953ce92b66c93f4a62123c799e499f62e 100644 (file)
--- 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 c78a235ba51d253b56634772ca2c9e3e67d1c39d..898b3f6878235ede926d5d7ee749ca371ee81090 100644 (file)
--- 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;