From: Timo Sirainen <tss@iki.fi>
Date: Sun, 4 Sep 2011 07:15:16 +0000 (+0300)
Subject: anvil: Assert-crashfix at exit when there were fifo connections.
X-Git-Tag: 2.1.alpha2~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d19fb2745f553746e283c6fc46c82fb402fc3e9b;p=thirdparty%2Fdovecot%2Fcore.git

anvil: Assert-crashfix at exit when there were fifo connections.
---

diff --git a/src/anvil/anvil-connection.c b/src/anvil/anvil-connection.c
index 113e39d916..1be5928f87 100644
--- a/src/anvil/anvil-connection.c
+++ b/src/anvil/anvil-connection.c
@@ -29,6 +29,7 @@ struct anvil_connection {
 	unsigned int version_received:1;
 	unsigned int handshaked:1;
 	unsigned int master:1;
+	unsigned int fifo:1;
 };
 
 struct anvil_connection *anvil_connections = NULL;
@@ -180,12 +181,15 @@ anvil_connection_create(int fd, bool master, bool fifo)
 		conn->output = o_stream_create_fd(fd, (size_t)-1, FALSE);
 	conn->io = io_add(fd, IO_READ, anvil_connection_input, conn);
 	conn->master = master;
+	conn->fifo = fifo;
 	DLLIST_PREPEND(&anvil_connections, conn);
 	return conn;
 }
 
 void anvil_connection_destroy(struct anvil_connection *conn)
 {
+	bool fifo = conn->fifo;
+
 	DLLIST_REMOVE(&anvil_connections, conn);
 
 	io_remove(&conn->io);
@@ -196,7 +200,8 @@ void anvil_connection_destroy(struct anvil_connection *conn)
 		i_error("close(anvil conn) failed: %m");
 	i_free(conn);
 
-	master_service_client_connection_destroyed(master_service);
+	if (!fifo)
+		master_service_client_connection_destroyed(master_service);
 }
 
 void anvil_connections_destroy_all(void)