From 235ef8cd3865984cc27f88a18d14ea98adb53f09 Mon Sep 17 00:00:00 2001
From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Mon, 27 Feb 2017 20:38:43 +0200
Subject: [PATCH] doveadm: Ensure -- is added to command line before positional
 arguments for non-mails commands as well

Was forgotten from 967efe37d1f10a28c0a086cc5919d4ce8917bed8
---
 src/doveadm/doveadm-cmd.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/doveadm/doveadm-cmd.c b/src/doveadm/doveadm-cmd.c
index 89450f5cc4..aa6daed95f 100644
--- a/src/doveadm/doveadm-cmd.c
+++ b/src/doveadm/doveadm-cmd.c
@@ -320,6 +320,10 @@ doveadm_cmd_params_to_argv(const char *name, int pargc, const struct doveadm_cmd
 	const char * const * cptr;
 	i_assert(array_count(argv) == 0);
 	array_append(argv, &name, 1);
+
+	ARRAY_TYPE(const_string) pargv;
+	t_array_init(&pargv, 8);
+
 	for(i=0;i<pargc;i++) {
 		const char *optarg = NULL;
 		/* istreams are special */
@@ -348,11 +352,20 @@ doveadm_cmd_params_to_argv(const char *name, int pargc, const struct doveadm_cmd
 				array_foreach(&params[i].value.v_array, cptr) {
 					if (array_add_opt)
 						array_append(argv, &optarg, 1);
-					array_append(argv, cptr, 1);
+					if ((params[i].flags & CMD_PARAM_FLAG_POSITIONAL) == 0)
+						array_append(argv, cptr, 1);
+					else
+						array_append(&pargv, cptr, 1);
 				}
 			}
 		}
 	}
+
+	if (array_count(&pargv) > 0) {
+		const char *dashdash = "--";
+		array_append(argv, &dashdash, 1);
+		array_append_array(argv, &pargv);
+	}
 	array_append_zero(argv);
 }
 
-- 
2.47.3