diff options
Diffstat (limited to 'crypto/heimdal/lib/kadm5/ipropd_slave.c')
| -rw-r--r-- | crypto/heimdal/lib/kadm5/ipropd_slave.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/crypto/heimdal/lib/kadm5/ipropd_slave.c b/crypto/heimdal/lib/kadm5/ipropd_slave.c index d3a4c93a..98efa24 100644 --- a/crypto/heimdal/lib/kadm5/ipropd_slave.c +++ b/crypto/heimdal/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. * @@ -33,7 +33,7 @@ #include "iprop.h" -RCSID("$Id: ipropd_slave.c,v 1.24 2001/08/31 03:12:17 assar Exp $"); +RCSID("$Id: ipropd_slave.c,v 1.26 2002/08/26 13:29:37 assar Exp $"); static krb5_log_facility *log_facility; @@ -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); } } @@ -227,6 +227,7 @@ receive_everything (krb5_context context, int fd, krb5_data data; int32_t vno; int32_t opcode; + unsigned long tmp; ret = server_context->db->open(context, server_context->db, @@ -268,7 +269,8 @@ receive_everything (krb5_context context, int fd, if (opcode != NOW_YOU_HAVE) krb5_errx (context, 1, "receive_everything: strange %d", opcode); - _krb5_get_int ((char *)data.data + 4, &vno, 4); + _krb5_get_int ((char *)data.data + 4, &tmp, 4); + vno = tmp; ret = kadm5_log_reinit (server_context); if (ret) |
