summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2004-08-04 06:59:37 +0000
committerKen Raeburn <raeburn@mit.edu>2004-08-04 06:59:37 +0000
commit19461d855f3a5fa11e9950d66e4f1e9ec3de8da0 (patch)
treed6e42e54edb93554517daaf51cb2ff08e1a4cae4 /src
parent91dc7b8c15704b0a875bc6272cef3478e1900f5f (diff)
downloadkrb5-19461d855f3a5fa11e9950d66e4f1e9ec3de8da0.tar.gz
krb5-19461d855f3a5fa11e9950d66e4f1e9ec3de8da0.tar.xz
krb5-19461d855f3a5fa11e9950d66e4f1e9ec3de8da0.zip
* 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
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/krb/ChangeLog5
-rw-r--r--src/lib/krb5/krb/srv_rcache.c12
2 files changed, 10 insertions, 7 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index acad5724ca..9d508e8953 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 c78a235ba5..898b3f6878 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;