From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 14 Sep 2011 16:12:25 +0000 (+0000)
Subject: Update verto sources to 2011-09-14 versions
X-Git-Tag: krb5-1.10-alpha1~201
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=61941e636016405b5dfbb031e2904dcce4c83801;p=krb5.git

Update verto sources to 2011-09-14 versions

Also add verto_reinitialize to libverto exports (missed in the last
update).

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

diff --git a/src/util/verto/libverto.exports b/src/util/verto/libverto.exports
index dcf395696..2f9b1ee2a 100644
--- a/src/util/verto/libverto.exports
+++ b/src/util/verto/libverto.exports
@@ -19,6 +19,7 @@ verto_get_signal
 verto_get_supported_types
 verto_get_type
 verto_new
+verto_reinitialize
 verto_run
 verto_run_once
 verto_set_default
diff --git a/src/util/verto/verto.c b/src/util/verto/verto.c
index 98cc30351..0f015d896 100644
--- a/src/util/verto/verto.c
+++ b/src/util/verto/verto.c
@@ -561,7 +561,7 @@ verto_reinitialize(verto_ctx *ctx)
 
     /* Delete all events, but keep around the forkable ev structs */
     for (tmp = ctx->events; tmp; tmp = next) {
-        next = ctx->events->next;
+        next = tmp->next;
 
         if (tmp->flags & VERTO_EV_FLAG_REINITIABLE)
             ctx->funcs.ctx_del(ctx->modpriv, tmp, tmp->modpriv);
@@ -575,7 +575,7 @@ verto_reinitialize(verto_ctx *ctx)
     /* Recreate events that were marked forkable */
     for (tmp = ctx->events; tmp; tmp = tmp->next) {
         tmp->actual = tmp->flags;
-        tmp->modpriv = ctx->funcs.ctx_add(ctx, tmp, &tmp->actual);
+        tmp->modpriv = ctx->funcs.ctx_add(ctx->modpriv, tmp, &tmp->actual);
         assert(tmp->modpriv);
     }
 }