dovecot-2.2: dsync: Fixed running dsync for multiple users withi...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/82ce71d8625c
changeset: 15985:82ce71d8625c
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Feb 27 12:07:06 2013 +0200
description:
dsync: Fixed running dsync for multiple users within same command.

diffstat:

 src/doveadm/dsync/doveadm-dsync.c |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diffs (30 lines):

diff -r 1aa33a573234 -r 82ce71d8625c src/doveadm/dsync/doveadm-dsync.c
--- a/src/doveadm/dsync/doveadm-dsync.c	Wed Feb 27 12:00:03 2013 +0200
+++ b/src/doveadm/dsync/doveadm-dsync.c	Wed Feb 27 12:07:06 2013 +0200
@@ -521,6 +521,8 @@
 		io_remove(&ctx->io_err);
 	if (ctx->fd_err != -1)
 		i_close_fd(&ctx->fd_err);
+	ctx->input = NULL;
+	ctx->output = NULL;
 	return ret;
 }
 
@@ -553,6 +555,9 @@
 {
 	struct ssl_iostream_settings ssl_set;
 
+	if (ctx->ssl_ctx != NULL)
+		return 0;
+
 	memset(&ssl_set, 0, sizeof(ssl_set));
 	ssl_set.ca_dir = doveadm_settings->ssl_client_ca_dir;
 	ssl_set.verify_remote_cert = TRUE;
@@ -611,6 +616,7 @@
 
 	if (ctx->error != NULL) {
 		*error_r = ctx->error;
+		ctx->error = NULL;
 		return -1;
 	}
 	ctx->run_type = DSYNC_RUN_TYPE_STREAM;