From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 15 Nov 2016 11:17:05 +0000 (+0200)
Subject: doveadm-director: Include tag in add line
X-Git-Tag: 2.2.27~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11eaa05833a7a009c50062a76c08f2b39bacd7c0;p=thirdparty%2Fdovecot%2Fcore.git

doveadm-director: Include tag in add line
---

diff --git a/src/doveadm/doveadm-director.c b/src/doveadm/doveadm-director.c
index bd00bb58c1..724fe1c7cc 100644
--- a/src/doveadm/doveadm-director.c
+++ b/src/doveadm/doveadm-director.c
@@ -750,9 +750,15 @@ static void cmd_director_dump(struct doveadm_cmd_context *cctx)
 		T_BEGIN {
 			args = t_strsplit_tab(line);
 			if (str_array_length(args) >= 2) {
+				const char *host = args[0];
+				/* this is guaranteed to be at least NULL */
+				if (args[2] != NULL &&
+				    *args[2] != '\0')
+					host = t_strdup_printf("%s@%s", host,
+							       args[2]);
 				doveadm_print("add");
 				doveadm_print(ctx->socket_path);
-				doveadm_print(args[0]);
+				doveadm_print(host);
 				doveadm_print(args[1]);
 			}
 		} T_END;