dovecot-2.2: director: Fixed recent tag reimplementation to actu...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/a36239ce0f78
changeset: 19439:a36239ce0f78
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Nov 30 21:39:07 2015 +0200
description:
director: Fixed recent tag reimplementation to actually work.
We still just created one large vhosts pool for all tags containing all the
hosts.

diffstat:

 src/director/mail-host.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r f643e85f42ec -r a36239ce0f78 src/director/mail-host.c
--- a/src/director/mail-host.c	Mon Nov 30 21:36:51 2015 +0200
+++ b/src/director/mail-host.c	Mon Nov 30 21:39:07 2015 +0200
@@ -67,7 +67,7 @@
 	char num_str[MAX_INT_STRLEN];
 	unsigned int i, j;
 
-	if (host->down)
+	if (host->down || host->tag != tag)
 		return;
 
 	ip_str = net_ip2addr(&host->ip);
@@ -110,7 +110,7 @@
 	/* rebuild vhosts */
 	array_clear(&tag->vhosts);
 	array_foreach(&list->hosts, hostp) {
-		if ((*hostp)->down)
+		if ((*hostp)->down || (*hostp)->tag != tag)
 			continue;
 		for (i = 0; i < (*hostp)->vhost_count; i++) {
 			vhost = array_append_space(&tag->vhosts);