oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

More comments and some more error checking.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21715 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-07-27 16:13:09 +00:00
parent c2e5865a1d
commit f23e5f1e58
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/kadm5/ipropd_slave.c
View File

@@ -161,7 +161,11 @@ receive_loop (krb5_context context,
off_t left, right; off_t left, right;
void *buf; void *buf;
int32_t vers; int32_t vers;
ssize_t sret;
/*
* Seek to the current version of the local database.
*/
do { do {
int32_t len, timestamp, tmp; int32_t len, timestamp, tmp;
enum kadm_ops op; enum kadm_ops op;
@@ -176,6 +180,9 @@ receive_loop (krb5_context context,
krb5_storage_seek(sp, len + 8, SEEK_CUR); krb5_storage_seek(sp, len + 8, SEEK_CUR);
} while(vers <= server_context->log_context.version); } while(vers <= server_context->log_context.version);
/*
* Read up rest of the entires into the memory...
*/
left = krb5_storage_seek (sp, -16, SEEK_CUR); left = krb5_storage_seek (sp, -16, SEEK_CUR);
right = krb5_storage_seek (sp, 0, SEEK_END); right = krb5_storage_seek (sp, 0, SEEK_END);
buf = malloc (right - left); buf = malloc (right - left);
@@ -183,16 +190,29 @@ receive_loop (krb5_context context,
krb5_warnx (context, "malloc: no memory"); krb5_warnx (context, "malloc: no memory");
return; return;
} }
/*
* ...and then write them out to the on-disk log.
*/
krb5_storage_seek (sp, left, SEEK_SET); krb5_storage_seek (sp, left, SEEK_SET);
krb5_storage_read (sp, buf, right - left); krb5_storage_read (sp, buf, right - left);
write (server_context->log_context.log_fd, buf, right-left); sret = write (server_context->log_context.log_fd, buf, right-left);
fsync (server_context->log_context.log_fd); if (sret != right - left)
krb5_err(context, 1, errno, "Failed to write log to disk");
ret = fsync (server_context->log_context.log_fd);
if (ret)
krb5_err(context, 1, errno, "Failed to sync log to disk");
free (buf); free (buf);
/*
* Go back to the startpoint and start to commit the entires to
* the database.
*/
krb5_storage_seek (sp, left, SEEK_SET); krb5_storage_seek (sp, left, SEEK_SET);
for(;;) { for(;;) {
int32_t len, timestamp, tmp; int32_t len, timestamp, tmp;
off_t cur;
enum kadm_ops op; enum kadm_ops op;
if(krb5_ret_int32 (sp, &vers) != 0) if(krb5_ret_int32 (sp, &vers) != 0)
@@ -201,6 +221,7 @@ receive_loop (krb5_context context,
krb5_ret_int32 (sp, &tmp); krb5_ret_int32 (sp, &tmp);
op = tmp; op = tmp;
krb5_ret_int32 (sp, &len); krb5_ret_int32 (sp, &len);
cur = krb5_storage_seek(sp, 0, SEEK_CUR);
ret = kadm5_log_replay (server_context, ret = kadm5_log_replay (server_context,
op, vers, len, sp); op, vers, len, sp);
@@ -208,7 +229,12 @@ receive_loop (krb5_context context,
krb5_warn (context, ret, "kadm5_log_replay: %d", (int)vers); krb5_warn (context, ret, "kadm5_log_replay: %d", (int)vers);
else else
server_context->log_context.version = vers; server_context->log_context.version = vers;
krb5_storage_seek (sp, 8, SEEK_CUR);
/*
* Don't trust the kadm5_log_reply* functions to do the right
* thing and set the offset to the end ourself.
*/
krb5_storage_seek (sp, cur + 8, SEEK_SET);
} }
} }
@@ -285,7 +311,6 @@ receive_everything (krb5_context context, int fd,
/* I really want to use O_EXCL here, but given that I can't easily clean /* I really want to use O_EXCL here, but given that I can't easily clean
up on error, I won't */ up on error, I won't */
ret = mydb->hdb_open(context, mydb, O_RDWR | O_CREAT | O_TRUNC, 0600); ret = mydb->hdb_open(context, mydb, O_RDWR | O_CREAT | O_TRUNC, 0600);
if (ret) if (ret)
krb5_err (context, 1, ret, "db->open"); krb5_err (context, 1, ret, "db->open");