diff --git a/kdc/524.c b/kdc/524.c
index 3ec33c989..f8cc7d2d8 100644
--- a/kdc/524.c
+++ b/kdc/524.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -278,12 +278,12 @@ out:
 	krb5_store_int32(sp, server->kvno); /* is this right? */
 	krb5_store_data(sp, ticket.cipher);
 	/* Aargh! This is coded as a KTEXT_ST. */
-	sp->seek(sp, MAX_KTXT_LEN - ticket.cipher.length, SEEK_CUR);
+	krb5_storage_seek(sp, MAX_KTXT_LEN - ticket.cipher.length, SEEK_CUR);
 	krb5_store_int32(sp, 0); /* mbz */
 	free_EncryptedData(&ticket);
     }
     ret = krb5_storage_to_data(sp, reply);
-    reply->length = (*sp->seek)(sp, 0, SEEK_CUR);
+    reply->length = krb5_storage_seek(sp, 0, SEEK_CUR);
     krb5_storage_free(sp);
     
     if(spn)
diff --git a/kdc/kaserver.c b/kdc/kaserver.c
index aaa1a159d..29b27cad9 100644
--- a/kdc/kaserver.c
+++ b/kdc/kaserver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -194,11 +194,11 @@ krb5_ret_xdr_data(krb5_storage *sp,
 	data->data = malloc(size);
 	if (data->data == NULL)
 	    return ENOMEM;
-	ret = sp->fetch(sp, data->data, size);
+	ret = krb5_storage_read(sp, data->data, size);
 	if(ret != size)
 	    return (ret < 0)? errno : KRB5_CC_END;
 	if (pad) {
-	    ret = sp->fetch(sp, foo, pad);
+	    ret = krb5_storage_read(sp, foo, pad);
 	    if (ret != pad)
 		return (ret < 0)? errno : KRB5_CC_END;
 	}
@@ -218,7 +218,7 @@ krb5_store_xdr_data(krb5_storage *sp,
     ret = krb5_store_int32(sp, data.length);
     if(ret < 0)
 	return ret;
-    ret = sp->store(sp, data.data, data.length);
+    ret = krb5_storage_write(sp, data.data, data.length);
     if(ret != data.length){
 	if(ret < 0)
 	    return errno;
@@ -226,7 +226,7 @@ krb5_store_xdr_data(krb5_storage *sp,
     }
     pad = (4 - data.length % 4) % 4;
     if (pad) {
-	ret = sp->store(sp, zero, pad);
+	ret = krb5_storage_write(sp, zero, pad);
 	if (ret != pad) {
 	    if (ret < 0)
 		return errno;
@@ -245,9 +245,9 @@ create_reply_ticket (struct rx_header *hdr,
 		     int life,
 		     int kvno,
 		     int32_t max_seq_len,
-		     char *sname, char *sinstance,
+		     const char *sname, const char *sinstance,
 		     u_int32_t challenge,
-		     char *label,
+		     const char *label,
 		     des_cblock *key,
 		     krb5_data *reply)
 {
@@ -276,7 +276,7 @@ create_reply_ticket (struct rx_header *hdr,
     fyrtiosjuelva &= 0xffffffff;
     krb5_store_int32 (sp, fyrtiosjuelva);
     krb5_store_int32 (sp, challenge);
-    sp->store  (sp, session, 8);
+    krb5_storage_write  (sp, session, 8);
     memset (&session, 0, sizeof(session));
     krb5_store_int32 (sp, kdc_time);
     krb5_store_int32 (sp, kdc_time + krb_life_to_time (0, life));
@@ -291,13 +291,13 @@ create_reply_ticket (struct rx_header *hdr,
 #endif
     krb5_store_stringz (sp, sname);
     krb5_store_stringz (sp, sinstance);
-    sp->store (sp, ticket.dat, ticket.length);
-    sp->store (sp, label, strlen(label));
+    krb5_storage_write (sp, ticket.dat, ticket.length);
+    krb5_storage_write (sp, label, strlen(label));
 
     /* pad to DES block */
     memset (zero, 0, sizeof(zero));
-    pad = (8 - sp->seek (sp, 0, SEEK_CUR) % 8) % 8;
-    sp->store (sp, zero, pad);
+    pad = (8 - krb5_storage_seek (sp, 0, SEEK_CUR) % 8) % 8;
+    krb5_storage_write (sp, zero, pad);
 
     krb5_storage_to_data (sp, &enc_data);
     krb5_storage_free (sp);
diff --git a/kdc/kerberos4.c b/kdc/kerberos4.c
index bb1a4bb74..b41ea356d 100644
--- a/kdc/kerberos4.c
+++ b/kdc/kerberos4.c
@@ -393,7 +393,7 @@ do_version4(unsigned char *buf,
 	RCHECK(krb5_ret_int8(sp, &ticket_len), out2);
 	RCHECK(krb5_ret_int8(sp, &req_len), out2);
 	
-	pos = sp->seek(sp, ticket_len + req_len, SEEK_CUR);
+	pos = krb5_storage_seek(sp, ticket_len + req_len, SEEK_CUR);
 	
 	memset(&auth, 0, sizeof(auth));
 	memcpy(&auth.dat, buf, pos);
@@ -625,7 +625,7 @@ encode_v4_ticket(void *buf, size_t len, const EncTicketPart *et,
 		    break;
 		}
 	}
-	sp->store(sp, tmp, sizeof(tmp));
+	krb5_storage_write(sp, tmp, sizeof(tmp));
     }
 
     if((et->key.keytype != ETYPE_DES_CBC_MD5 &&
@@ -633,7 +633,7 @@ encode_v4_ticket(void *buf, size_t len, const EncTicketPart *et,
 	et->key.keytype != ETYPE_DES_CBC_CRC) || 
        et->key.keyvalue.length != 8)
 	return -1;
-    sp->store(sp, et->key.keyvalue.data, 8);
+    krb5_storage_write(sp, et->key.keyvalue.data, 8);
     
     {
 	time_t start = et->starttime ? *et->starttime : et->authtime;