From a2532003186d63337e1cbf9ba8f8f7ec401dea58 Mon Sep 17 00:00:00 2001
From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 15 Nov 2016 13:17:05 +0200
Subject: [PATCH] doveadm-director: Include tag in add line

---
 src/doveadm/doveadm-director.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/doveadm/doveadm-director.c b/src/doveadm/doveadm-director.c
index 9561456fc1..736fcbf462 100644
--- a/src/doveadm/doveadm-director.c
+++ b/src/doveadm/doveadm-director.c
@@ -765,9 +765,15 @@ static void cmd_director_dump(struct doveadm_cmd_context *cctx)
 		T_BEGIN {
 			args = t_strsplit_tabescaped(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;
-- 
2.47.3