Named Queues: fix immediate-delivery. Bug 2743

[exim.git] / src / src / exim.c

diff --git a/src/src/exim.c b/src/src/exim.c
index 3e08f0376fbe2019738ddd4c1ac46167030999ce..fd1d87362dc924c4363b10e8ea6807af5fece4c6 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -2784,9 +2784,11 @@ on the second character (the one after '-'), to save some effort. */
                  else badarg = TRUE;
                  break;
 
-    /* -MCG: set the queue name, to a non-default value */
+    /* -MCG: set the queue name, to a non-default value. Arguably, anything
+       from the commandline should be tainted - but we will need an untainted
+       value for the spoolfile when doing a -odi delivery process. */
 
-       case 'G': if (++i < argc) queue_name = string_copy_taint(argv[i], TRUE);
+       case 'G': if (++i < argc) queue_name = string_copy_taint(argv[i], FALSE);
                  else badarg = TRUE;
                  break;