From: Timo Sirainen <tss@iki.fi>
Date: Thu, 9 Feb 2012 03:21:22 +0000 (+0200)
Subject: doveadm proxy list: Avoid hanging if we can't connect to ipc socket.
X-Git-Tag: 2.1.rc6~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbcc083b53cc2e263f039edd4e4c7cb74830651e;p=thirdparty%2Fdovecot%2Fcore.git

doveadm proxy list: Avoid hanging if we can't connect to ipc socket.
---

diff --git a/src/doveadm/doveadm-proxy.c b/src/doveadm/doveadm-proxy.c
index c4c69caa18..75aa4d9301 100644
--- a/src/doveadm/doveadm-proxy.c
+++ b/src/doveadm/doveadm-proxy.c
@@ -74,9 +74,11 @@ static void cmd_proxy_list(int argc, char *argv[])
 	doveadm_print_header("dest-ip", "dest ip", 0);
 	doveadm_print_header("dest-port", "port", 0);
 
+	io_loop_set_running(current_ioloop);
 	ipc_client_cmd(ctx->ipc, "proxy\t*\tLIST",
 		       cmd_proxy_list_callback, NULL);
-	io_loop_run(current_ioloop);
+	if (io_loop_is_running(current_ioloop))
+		io_loop_run(current_ioloop);
 	ipc_client_deinit(&ctx->ipc);
 }