change first arg of krb5_get_server_rcache to a krb5_data *

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

8 files changed, 16 insertions, 8 deletions

diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c
index fa0ca5ef0..7d6525ed6 100644
--- a/src/appl/simple/server/sim_server.c
+++ b/src/appl/simple/server/sim_server.c
@@ -192,7 +192,7 @@ char *argv[];
 	exit(1);
     }
 
-    if (retval = krb5_get_server_rcache(sprinc[1]->data, &rcache)) {
+    if (retval = krb5_get_server_rcache(sprinc[1], &rcache)) {
 	com_err(PROGNAME, retval, "while opening replay cache");
 	exit(1);
     }
diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index 622b10ecc..d5bf4afe2 100644
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -171,7 +171,7 @@ krb5_error_code krb5_generate_subkey
 krb5_error_code krb5_generate_seq_number
     PROTOTYPE((const krb5_keyblock *, krb5_int32 *));
 krb5_error_code krb5_get_server_rcache
-    PROTOTYPE((const char *, krb5_rcache *));
+    PROTOTYPE((const krb5_data *, krb5_rcache *));
 krb5_error_code krb5_build_principal_ext
     STDARG_P((krb5_principal *, int, const char *, ...));
 krb5_error_code krb5_build_principal
diff --git a/src/lib/gssapi/acc_sec.c b/src/lib/gssapi/acc_sec.c
index 222c09327..17a21e8e0 100644
--- a/src/lib/gssapi/acc_sec.c
+++ b/src/lib/gssapi/acc_sec.c
@@ -116,7 +116,7 @@ OM_uint32 gss_accept_sec_context(minor_status, context_handle,
 		/*
 		 * Setup the replay cache.
 		 */
-		if (*minor_status = krb5_get_server_rcache(server[1]->data,
+		if (*minor_status = krb5_get_server_rcache(server[1],
 							   &rcache))
 			return(GSS_S_FAILURE);
 		/*
diff --git a/src/lib/krb425/mk_priv.c b/src/lib/krb425/mk_priv.c
index f3442c779..96b8c3689 100644
--- a/src/lib/krb425/mk_priv.c
+++ b/src/lib/krb425/mk_priv.c
@@ -79,7 +79,9 @@ struct sockaddr_in *receiver;
 	}
 
 
-	if (r = krb5_get_server_rcache(inet_ntoa(sender->sin_addr),
+	out5.data = inet_ntoa(sender->sin_addr);
+	out5.length = strlen(out5.data);
+	if (r = krb5_get_server_rcache(&out5,
 				       &rcache)) {
 	    krb5_free_address(saddr2);
 #ifdef	EBUG
diff --git a/src/lib/krb425/mk_safe.c b/src/lib/krb425/mk_safe.c
index 8d132e1ae..45748f055 100644
--- a/src/lib/krb425/mk_safe.c
+++ b/src/lib/krb425/mk_safe.c
@@ -77,7 +77,9 @@ struct sockaddr_in *receiver;
 	    return(-1);
 	}
 
-	if (r = krb5_get_server_rcache(inet_ntoa(sender->sin_addr),
+	out5.data = inet_ntoa(sender->sin_addr);
+	out5.length = strlen(out5.data);
+	if (r = krb5_get_server_rcache(&out5,
 				       &rcache)) {
 	    krb5_free_address(saddr2);
 #ifdef	EBUG
diff --git a/src/lib/krb425/rd_priv.c b/src/lib/krb425/rd_priv.c
index 20cc6359e..f402b6f2b 100644
--- a/src/lib/krb425/rd_priv.c
+++ b/src/lib/krb425/rd_priv.c
@@ -90,7 +90,9 @@ MSG_DAT *msg;
 	    return(krb425error(ENOMEM));
 	}
 	    
-	if (r = krb5_get_server_rcache(cachename,
+	out.data = cachename;
+	out.length = strlen(cachename);
+	if (r = krb5_get_server_rcache(&out,
 				       &rcache)) {
 	    krb5_free_address(saddr2);
 #ifdef	EBUG
diff --git a/src/lib/krb425/rd_safe.c b/src/lib/krb425/rd_safe.c
index 0002db9f8..9ee0221bc 100644
--- a/src/lib/krb425/rd_safe.c
+++ b/src/lib/krb425/rd_safe.c
@@ -89,7 +89,9 @@ MSG_DAT *msg;
 	    return(krb425error(ENOMEM));
 	}
 	    
-	if (r = krb5_get_server_rcache(cachename,
+	out.data = cachename;
+	out.length = strlen(cachename);
+	if (r = krb5_get_server_rcache(&out,
 				       &rcache)) {
 	    krb5_free_address(saddr2);
 #ifdef	EBUG
diff --git a/src/lib/krb5/krb/rd_req_sim.c b/src/lib/krb5/krb/rd_req_sim.c
index 95157aded..ef379c783 100644
--- a/src/lib/krb5/krb/rd_req_sim.c
+++ b/src/lib/krb5/krb/rd_req_sim.c
@@ -74,7 +74,7 @@ krb5_tkt_authent **authdat;
 	    return(retval);
 	}
     }
-    if (!(retval = krb5_get_server_rcache(server[1]->data, &rcache))) {
+    if (!(retval = krb5_get_server_rcache(server[1], &rcache))) {
 	retval = krb5_rd_req_decoded(request, server,
 				     sender_addr, 0,
 				     0, 0, rcache, authdat);