From 4fa94362ee35c7bac307ee182b8345b088365a47 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Fri, 24 May 2002 15:23:43 +0000
Subject: [PATCH] fix for storage change

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11021 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 kadmin/server.c           |  4 ++--
 kadmin/version4.c         | 14 ++++++-------
 lib/45/mk_req.c           |  6 +++---
 lib/hdb/print.c           |  8 +++----
 lib/kadm5/dump_log.c      | 16 +++++++-------
 lib/kadm5/ipropd_master.c |  8 +++----
 lib/kadm5/ipropd_slave.c  | 16 +++++++-------
 lib/kadm5/log.c           | 44 +++++++++++++++++++--------------------
 lib/kadm5/replay_log.c    |  4 ++--
 lib/kadm5/send_recv.c     |  8 +++----
 10 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/kadmin/server.c b/kadmin/server.c
index c1ba9d858..105c99352 100644
--- a/kadmin/server.c
+++ b/kadmin/server.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. 
  *
@@ -404,7 +404,7 @@ kadmind_dispatch(void *kadm_handle, krb5_boolean initial,
     return 0;
 fail:
     krb5_warn(context->context, ret, "%s", op);
-    sp->seek(sp, 0, SEEK_SET);
+    krb5_storage_seek(sp, 0, SEEK_SET);
     krb5_store_int32(sp, ret);
     krb5_storage_to_data(sp, out);
     krb5_storage_free(sp);
diff --git a/kadmin/version4.c b/kadmin/version4.c
index f992fe862..f934eb190 100644
--- a/kadmin/version4.c
+++ b/kadmin/version4.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 - 2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1999 - 2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -61,13 +61,13 @@ make_you_loose_packet(int code, krb5_data *reply)
 static int
 ret_fields(krb5_storage *sp, char *fields)
 {
-    return sp->fetch(sp, fields, FLDSZ);
+    return krb5_storage_read(sp, fields, FLDSZ);
 }
 
 static int
 store_fields(krb5_storage *sp, char *fields)
 {
-    return sp->store(sp, fields, FLDSZ);
+    return krb5_storage_write(sp, fields, FLDSZ);
 }
 
 static void
@@ -470,8 +470,8 @@ kadm_ser_cpw(krb5_context context,
     krb5_warnx(context, "v4-compat %s: CHPASS %s",
 	       principal_string, principal_string); 
 
-    ret = message->fetch(message, key + 4, 4);
-    ret = message->fetch(message, key, 4);
+    ret = krb5_storage_read(message, key + 4, 4);
+    ret = krb5_storage_read(message, key, 4);
     ret = krb5_ret_stringz(message, &password);
     
     if(password) {
@@ -740,7 +740,7 @@ dispatch(krb5_context context,
     krb5_ret_int8(sp_in, &command);
     
     sp_out = krb5_storage_emem();
-    sp_out->store(sp_out, KADM_VERSTR, KADM_VERSIZE);
+    krb5_storage_write(sp_out, KADM_VERSTR, KADM_VERSIZE);
     krb5_store_int32(sp_out, 0);
 
     switch(command) {
@@ -777,7 +777,7 @@ dispatch(krb5_context context,
     }
     krb5_storage_free(sp_in);
     if(retval) {
-	sp_out->seek(sp_out, KADM_VERSIZE, SEEK_SET);
+	krb5_storage_seek(sp_out, KADM_VERSIZE, SEEK_SET);
 	krb5_store_int32(sp_out, retval);
     }
     krb5_storage_to_data(sp_out, reply);
diff --git a/lib/45/mk_req.c b/lib/45/mk_req.c
index f70d17537..cbff957ef 100644
--- a/lib/45/mk_req.c
+++ b/lib/45/mk_req.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2000, 2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -108,8 +108,8 @@ krb_mk_req(KTEXT authent,
 
     krb5_store_int8(sp, req.length);
 
-    sp->store(sp, cr.ticket_st.dat, cr.ticket_st.length);
-    sp->store(sp, req.dat, req.length);
+    krb5_storage_write(sp, cr.ticket_st.dat, cr.ticket_st.length);
+    krb5_storage_write(sp, req.dat, req.length);
     krb5_storage_to_data(sp, &a);
     krb5_storage_free(sp);
     memcpy(authent->dat, a.data, a.length);
diff --git a/lib/hdb/print.c b/lib/hdb/print.c
index 2cb661e8d..8e0753f4d 100644
--- a/lib/hdb/print.c
+++ b/lib/hdb/print.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1999-2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -71,7 +71,7 @@ append_string(krb5_context context, krb5_storage *sp, const char *fmt, ...)
 	krb5_set_error_string(context, "malloc: out of memory");
 	return ENOMEM;
     }
-    ret = sp->store(sp, s, strlen(s));
+    ret = krb5_storage_write(sp, s, strlen(s));
     free(s);
     return ret;
 }
@@ -226,7 +226,7 @@ hdb_entry2string (krb5_context context, hdb_entry *ent, char **str)
 	return ret;
     }
 
-    sp->store(sp, "\0", 1);
+    krb5_storage_write(sp, "\0", 1);
     krb5_storage_to_data(sp, &data);
     krb5_storage_free(sp);
     *str = data.data;
@@ -256,7 +256,7 @@ hdb_print_entry(krb5_context context, HDB *db, hdb_entry *entry, void *data)
 	return ret;
     }
 
-    sp->store(sp, "\n", 1);
+    krb5_storage_write(sp, "\n", 1);
     krb5_storage_free(sp);
     return 0;
 }
diff --git a/lib/kadm5/dump_log.c b/lib/kadm5/dump_log.c
index f3beef6ab..7a6d0c15d 100644
--- a/lib/kadm5/dump_log.c
+++ b/lib/kadm5/dump_log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -59,14 +59,14 @@ print_entry(kadm5_server_context *server_context,
 	    krb5_storage *sp)
 {
     char t[256];
-    u_int32_t mask;
+    int32_t mask;
     hdb_entry ent;
     krb5_principal source;
     char *name1, *name2;
     krb5_data data;
     krb5_context context = server_context->context;
 
-    off_t end = sp->seek(sp, 0, SEEK_CUR) + len;
+    off_t end = krb5_storage_seek(sp, 0, SEEK_CUR) + len;
     
     krb5_error_code ret;
 
@@ -74,7 +74,7 @@ print_entry(kadm5_server_context *server_context,
 
     if(op < kadm_get || op > kadm_nop) {
 	printf("unknown op: %d\n", op);
-	sp->seek(sp, end, SEEK_SET);
+	krb5_storage_seek(sp, end, SEEK_SET);
 	return;
     }
 
@@ -91,7 +91,7 @@ print_entry(kadm5_server_context *server_context,
     case kadm_rename:
 	krb5_data_alloc(&data, len);
 	krb5_ret_principal(sp, &source);
-	sp->fetch(sp, data.data, data.length);
+	krb5_storage_read(sp, data.data, data.length);
 	hdb_value2entry(context, &data, &ent);
 	krb5_unparse_name(context, source, &name1);
 	krb5_unparse_name(context, ent.principal, &name2);
@@ -103,7 +103,7 @@ print_entry(kadm5_server_context *server_context,
 	break;
     case kadm_create:
 	krb5_data_alloc(&data, len);
-	sp->fetch(sp, data.data, data.length);
+	krb5_storage_read(sp, data.data, data.length);
 	ret = hdb_value2entry(context, &data, &ent);
 	if(ret)
 	    abort();
@@ -112,7 +112,7 @@ print_entry(kadm5_server_context *server_context,
     case kadm_modify:
 	krb5_data_alloc(&data, len);
 	krb5_ret_int32(sp, &mask);
-	sp->fetch(sp, data.data, data.length);
+	krb5_storage_read(sp, data.data, data.length);
 	ret = hdb_value2entry(context, &data, &ent);
 	if(ret)
 	    abort();
@@ -204,7 +204,7 @@ print_entry(kadm5_server_context *server_context,
     default:
 	abort();
     }
-    sp->seek(sp, end, SEEK_SET);
+    krb5_storage_seek(sp, end, SEEK_SET);
 }
 
 static char *realm;
diff --git a/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c
index 1a8d7bc88..4cc32d969 100644
--- a/lib/kadm5/ipropd_master.c
+++ b/lib/kadm5/ipropd_master.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. 
  *
@@ -280,11 +280,11 @@ send_diffs (krb5_context context, slave *s, int log_fd,
 	return 0;
 
     sp = kadm5_log_goto_end (log_fd);
-    right = sp->seek(sp, 0, SEEK_CUR);
+    right = krb5_storage_seek(sp, 0, SEEK_CUR);
     for (;;) {
 	if (kadm5_log_previous (sp, &ver, &timestamp, &op, &len))
 	    abort ();
-	left = sp->seek(sp, -16, SEEK_CUR);
+	left = krb5_storage_seek(sp, -16, SEEK_CUR);
 	if (ver == s->version)
 	    return 0;
 	if (ver == s->version + 1)
@@ -293,7 +293,7 @@ send_diffs (krb5_context context, slave *s, int log_fd,
 	    return send_complete (context, s, database, current_version);
     }
     krb5_data_alloc (&data, right - left + 4);
-    sp->fetch (sp, (char *)data.data + 4, data.length - 4);
+    krb5_storage_read (sp, (char *)data.data + 4, data.length - 4);
     krb5_storage_free(sp);
 
     _krb5_put_int(data.data, FOR_YOU, 4);
diff --git a/lib/kadm5/ipropd_slave.c b/lib/kadm5/ipropd_slave.c
index 0aa2b58be..b3f0bd545 100644
--- a/lib/kadm5/ipropd_slave.c
+++ b/lib/kadm5/ipropd_slave.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. 
  *
@@ -159,23 +159,23 @@ receive_loop (krb5_context context,
 	op = tmp;
 	krb5_ret_int32 (sp, &len);
 	if (vers <= server_context->log_context.version)
-	    sp->seek(sp, len, SEEK_CUR);
+	    krb5_storage_seek(sp, len, SEEK_CUR);
     } while(vers <= server_context->log_context.version);
 
-    left  = sp->seek (sp, -16, SEEK_CUR);
-    right = sp->seek (sp, 0, SEEK_END);
+    left  = krb5_storage_seek (sp, -16, SEEK_CUR);
+    right = krb5_storage_seek (sp, 0, SEEK_END);
     buf = malloc (right - left);
     if (buf == NULL && (right - left) != 0) {
 	krb5_warnx (context, "malloc: no memory");
 	return;
     }
-    sp->seek (sp, left, SEEK_SET);
-    sp->fetch (sp, buf, right - left);
+    krb5_storage_seek (sp, left, SEEK_SET);
+    krb5_storage_read (sp, buf, right - left);
     write (server_context->log_context.log_fd, buf, right-left);
     fsync (server_context->log_context.log_fd);
     free (buf);
 
-    sp->seek (sp, left, SEEK_SET);
+    krb5_storage_seek (sp, left, SEEK_SET);
 
     for(;;) {
 	int32_t len, timestamp, tmp;
@@ -194,7 +194,7 @@ receive_loop (krb5_context context,
 	    krb5_warn (context, ret, "kadm5_log_replay");
 	else
 	    server_context->log_context.version = vers;
-	sp->seek (sp, 8, SEEK_CUR);
+	krb5_storage_seek (sp, 8, SEEK_CUR);
     }
 }
 
diff --git a/lib/kadm5/log.c b/lib/kadm5/log.c
index ff75d2cac..bf44772bc 100644
--- a/lib/kadm5/log.c
+++ b/lib/kadm5/log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -64,7 +64,7 @@ kadm5_log_get_version_fd (int fd,
 	return 0;
     }
     sp = krb5_storage_from_fd (fd);
-    sp->seek(sp, -4, SEEK_CUR);
+    krb5_storage_seek(sp, -4, SEEK_CUR);
     krb5_ret_int32 (sp, &old_version);
     *ver = old_version;
     krb5_storage_free(sp);
@@ -237,7 +237,7 @@ kadm5_log_create (kadm5_server_context *context,
 	return ret;
     }
     krb5_store_int32 (sp, value.length);
-    sp->store(sp, value.data, value.length);
+    krb5_storage_write(sp, value.data, value.length);
     krb5_store_int32 (sp, value.length);
     krb5_data_free (&value);
     ret = kadm5_log_postamble (log_context, sp);
@@ -269,7 +269,7 @@ kadm5_log_replay_create (kadm5_server_context *context,
     hdb_entry ent;
 
     krb5_data_alloc (&data, len);
-    sp->fetch (sp, data.data, len);
+    krb5_storage_read (sp, data.data, len);
     ret = hdb_value2entry (context->context, &data, &ent);
     krb5_data_free(&data);
     if (ret)
@@ -300,12 +300,12 @@ kadm5_log_delete (kadm5_server_context *context,
 	return ret;
     }
     krb5_store_int32 (sp, 0);
-    off = sp->seek (sp, 0, SEEK_CUR);
+    off = krb5_storage_seek (sp, 0, SEEK_CUR);
     krb5_store_principal (sp, princ);
-    len = sp->seek (sp, 0, SEEK_CUR) - off;
-    sp->seek(sp, -(len + 4), SEEK_CUR);
+    len = krb5_storage_seek (sp, 0, SEEK_CUR) - off;
+    krb5_storage_seek(sp, -(len + 4), SEEK_CUR);
     krb5_store_int32 (sp, len);
-    sp->seek(sp, len, SEEK_CUR);
+    krb5_storage_seek(sp, len, SEEK_CUR);
     krb5_store_int32 (sp, len);
     if (ret) {
 	krb5_storage_free (sp);
@@ -373,15 +373,15 @@ kadm5_log_rename (kadm5_server_context *context,
 	return ret;
     }
     krb5_store_int32 (sp, 0);
-    off = sp->seek (sp, 0, SEEK_CUR);
+    off = krb5_storage_seek (sp, 0, SEEK_CUR);
     krb5_store_principal (sp, source);
-    sp->store(sp, value.data, value.length);
+    krb5_storage_write(sp, value.data, value.length);
     krb5_data_free (&value);
-    len = sp->seek (sp, 0, SEEK_CUR) - off;
+    len = krb5_storage_seek (sp, 0, SEEK_CUR) - off;
 
-    sp->seek(sp, -(len + 4), SEEK_CUR);
+    krb5_storage_seek(sp, -(len + 4), SEEK_CUR);
     krb5_store_int32 (sp, len);
-    sp->seek(sp, len, SEEK_CUR);
+    krb5_storage_seek(sp, len, SEEK_CUR);
     krb5_store_int32 (sp, len);
     if (ret) {
 	krb5_storage_free (sp);
@@ -417,12 +417,12 @@ kadm5_log_replay_rename (kadm5_server_context *context,
     off_t off;
     size_t princ_len, data_len;
 
-    off = sp->seek(sp, 0, SEEK_CUR);
+    off = krb5_storage_seek(sp, 0, SEEK_CUR);
     krb5_ret_principal (sp, &source);
-    princ_len = sp->seek(sp, 0, SEEK_CUR) - off;
+    princ_len = krb5_storage_seek(sp, 0, SEEK_CUR) - off;
     data_len = len - princ_len;
     krb5_data_alloc (&value, data_len);
-    sp->fetch (sp, value.data, data_len);
+    krb5_storage_read (sp, value.data, data_len);
     ret = hdb_value2entry (context->context, &value, &target_ent);
     krb5_data_free(&value);
     if (ret) {
@@ -472,7 +472,7 @@ kadm5_log_modify (kadm5_server_context *context,
     len = value.length + 4;
     krb5_store_int32 (sp, len);
     krb5_store_int32 (sp, mask);
-    sp->store(sp, value.data, value.length);
+    krb5_storage_write (sp, value.data, value.length);
     krb5_data_free (&value);
     krb5_store_int32 (sp, len);
     if (ret) {
@@ -510,7 +510,7 @@ kadm5_log_replay_modify (kadm5_server_context *context,
     krb5_ret_int32 (sp, &mask);
     len -= 4;
     krb5_data_alloc (&value, len);
-    sp->fetch (sp, value.data, len);
+    krb5_storage_read (sp, value.data, len);
     ret = hdb_value2entry (context->context, &value, &log_ent);
     krb5_data_free(&value);
     if (ret)
@@ -689,7 +689,7 @@ kadm5_log_foreach (kadm5_server_context *context,
 	krb5_ret_int32 (sp, &op);
 	krb5_ret_int32 (sp, &len);
 	(*func)(context, ver, timestamp, op, len, sp);
-	sp->seek(sp, 8, SEEK_CUR);
+	krb5_storage_seek(sp, 8, SEEK_CUR);
     }
     return 0;
 }
@@ -704,7 +704,7 @@ kadm5_log_goto_end (int fd)
     krb5_storage *sp;
 
     sp = krb5_storage_from_fd (fd);
-    sp->seek(sp, 0, SEEK_END);
+    krb5_storage_seek(sp, 0, SEEK_END);
     return sp;
 }
 
@@ -722,13 +722,13 @@ kadm5_log_previous (krb5_storage *sp,
     off_t off;
     int32_t tmp;
 
-    sp->seek(sp, -8, SEEK_CUR);
+    krb5_storage_seek(sp, -8, SEEK_CUR);
     krb5_ret_int32 (sp, &tmp);
     *len = tmp;
     krb5_ret_int32 (sp, &tmp);
     *ver = tmp;
     off = 24 + *len;
-    sp->seek(sp, -off, SEEK_CUR);
+    krb5_storage_seek(sp, -off, SEEK_CUR);
     krb5_ret_int32 (sp, &tmp);
     assert(tmp == *ver);
     krb5_ret_int32 (sp, &tmp);
diff --git a/lib/kadm5/replay_log.c b/lib/kadm5/replay_log.c
index 1693ab5a7..2a343b444 100644
--- a/lib/kadm5/replay_log.c
+++ b/lib/kadm5/replay_log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998, 1999, 2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -51,7 +51,7 @@ apply_entry(kadm5_server_context *server_context,
     if((start_version != -1 && ver < start_version) ||
        (end_version != -1 && ver > end_version)) {
 	/* XXX skip this entry */
-	(*sp->seek)(sp, len, SEEK_CUR);
+	krb5_storage_seek(sp, len, SEEK_CUR);
 	return;
     }
     printf ("ver %u... ", ver);
diff --git a/lib/kadm5/send_recv.c b/lib/kadm5/send_recv.c
index 3ef968b60..f36db8af1 100644
--- a/lib/kadm5/send_recv.c
+++ b/lib/kadm5/send_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -45,10 +45,10 @@ _kadm5_client_send(kadm5_client_context *context, krb5_storage *sp)
 
     assert(context->sock != -1);
 
-    len = sp->seek(sp, 0, SEEK_CUR);
+    len = krb5_storage_seek(sp, 0, SEEK_CUR);
     ret = krb5_data_alloc(&msg, len);
-    sp->seek(sp, 0, SEEK_SET);
-    sp->fetch(sp, msg.data, msg.length);
+    krb5_storage_seek(sp, 0, SEEK_SET);
+    krb5_storage_read(sp, msg.data, msg.length);
     
     ret = krb5_mk_priv(context->context, context->ac, &msg, &out, NULL);
     krb5_data_free(&msg);