From: Ken Raeburn <raeburn@mit.edu>
Date: Fri, 4 Jun 2004 21:37:18 +0000 (+0000)
Subject: Oops
X-Git-Tag: krb5-1.4-beta1~362
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8098a4418fab43cb5ec1ba07b103b4f5aea2c3df;p=krb5.git

Oops

* srv_rcache.c (krb5_get_server_rcache): Don't forget to actually include the
cache type in the cache name, after looking it up.

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 83e4b1ddf..811409b0b 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-04  Ken Raeburn  <raeburn@mit.edu>
+
+	* srv_rcache.c (krb5_get_server_rcache): Don't forget to actually
+	include the cache type in the cache name, after looking it up.
+
 2004-06-02  Ken Raeburn  <raeburn@mit.edu>
 
 	* init_ctx.c (init_common): Don't call krb5_init_ets.
diff --git a/src/lib/krb5/krb/srv_rcache.c b/src/lib/krb5/krb/srv_rcache.c
index 99e965563..c78a235ba 100644
--- a/src/lib/krb5/krb/srv_rcache.c
+++ b/src/lib/krb5/krb/srv_rcache.c
@@ -34,7 +34,8 @@
 /* Macro for valid RC name characters*/
 #define isvalidrcname(x) ((!ispunct(x))&&isgraph(x))
 krb5_error_code KRB5_CALLCONV
-krb5_get_server_rcache(krb5_context context, const krb5_data *piece, krb5_rcache *rcptr)
+krb5_get_server_rcache(krb5_context context, const krb5_data *piece,
+		       krb5_rcache *rcptr)
 {
     krb5_rcache rcache = 0;
     char *cachename = 0, *cachetype;
@@ -72,8 +73,10 @@ krb5_get_server_rcache(krb5_context context, const krb5_data *piece, krb5_rcache
 	retval = ENOMEM;
 	goto cleanup;
     }
+    strcpy(cachename, cachetype);
 
     p = strlen(cachename);
+    cachename[p++] = ':';
     for (i = 0; i < piece->length; i++) {
 	if (piece->data[i] == '-') {
 	    cachename[p++] = '-';