X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/acfde2172e82f6b776f16d78f789c6968b69b9f0..19fdbfb4a2b6ca4a6a96ef52be848f0a23e2414f:/src/src/acl.c

diff --git a/src/src/acl.c b/src/src/acl.c
index 19c1bbbd9..fa1172331 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -3498,25 +3498,39 @@ for (; cb; cb = cb->next)
 	      }
 	    else if (Ustrncmp(pp, "kill", 4) == 0)
 	      {
-	      for (pp += 4; *pp && *pp != '/';) pp++;
+	      pp += 4;
 	      kill = TRUE;
 	      }
 	    else if (Ustrncmp(pp, "stop", 4) == 0)
 	      {
-	      for (pp += 4; *pp && *pp != '/';) pp++;
+	      pp += 4;
 	      stop = TRUE;
 	      }
-	    else
-	      while (*pp && *pp != '/') pp++;
+	    else if (Ustrncmp(pp, "pretrigger=", 11) == 0)
+		debug_pretrigger_setup(pp+11);
+	    else if (Ustrncmp(pp, "trigger=", 8) == 0)
+	      {
+	      if (Ustrncmp(pp += 8, "now", 3) == 0)
+		{
+		pp += 3;
+		debug_trigger_fire();
+		}
+	      else if (Ustrncmp(pp, "paniclog", 8) == 0)
+		{
+		pp += 8;
+		dtrigger_selector |= BIT(DTi_panictrigger);
+		}
+	      }
+	    while (*pp && *pp != '/') pp++;
 	    p = pp;
 	    }
 
-	    if (kill)
-	      debug_logging_stop(TRUE);
-	    else if (stop)
-	      debug_logging_stop(FALSE);
-	    else
-	      debug_logging_activate(debug_tag, debug_opts);
+	  if (kill)
+	    debug_logging_stop(TRUE);
+	  else if (stop)
+	    debug_logging_stop(FALSE);
+	  else if (debug_tag || debug_opts)
+	    debug_logging_activate(debug_tag, debug_opts);
 	  break;
 	  }