23 files changed, 375 insertions, 10 deletions
diff --git a/test/confs/0574 b/test/confs/0628
index 8703c0219..4369f5a99 100644
--- a/test/confs/0574
+++ b/test/confs/0628
@@ -1,4 +1,4 @@
-# Exim test configuration 0574
+# Exim test configuration 0628
 
 .include DIR/aux-var/std_conf_prefix
 
@@ -15,13 +15,14 @@ acl_smtp_data = chk_data
 begin acl
 
 chk_mail:
-  accept control = debug/tag=_1
+  accept control =		debug/tag=_1
 
 chk_rcpt:
-  accept control = debug/kill
+  accept control =		debug/kill
 
 chk_data:
-  accept control = debug/tag=_2/opts=+all
+  accept control =		debug/tag=_2/opts=+all
+
 
 # ----- Routers -----
 
diff --git a/test/confs/0629 b/test/confs/0629
new file mode 100644
index 000000000..15ae731ae
--- /dev/null
+++ b/test/confs/0629
@@ -0,0 +1,22 @@
+# Exim test configuration 0629
+
+.include DIR/aux-var/std_conf_prefix
+
+primary_hostname = myhost.test.ex
+
+# ----- Main settings -----
+
+acl_smtp_mail = chk_mail
+acl_smtp_rcpt = chk_rcpt
+
+# ----- ACL -----
+
+begin acl
+
+chk_mail:
+  accept control =		debug/tag=_rcpt/pretrigger=1024/trigger=paniclog
+
+chk_rcpt:
+  deny   log_reject_target =	panic
+
+# End
diff --git a/test/confs/0630 b/test/confs/0630
new file mode 100644
index 000000000..b83790f19
--- /dev/null
+++ b/test/confs/0630
@@ -0,0 +1,32 @@
+# Exim test configuration 0630
+
+.include DIR/aux-var/std_conf_prefix
+
+primary_hostname = myhost.test.ex
+
+# ----- Main settings -----
+
+acl_smtp_mail = chk_mail
+acl_smtp_rcpt = chk_rcpt
+
+# ----- ACL -----
+
+begin acl
+
+chk_mail:
+  accept control =		debug/tag=_router/opts=+all/pretrigger=2040/trigger=paniclog
+
+chk_rcpt:
+  accept
+
+# ----- Routers -----
+
+begin routers
+
+r0:
+	# cause paniclog write (by using a tainted filename)
+	driver =	redirect
+	local_parts =	$spool_directory/$local_part
+	data =		:blackhole:
+#
+# End
diff --git a/test/confs/0631 b/test/confs/0631
new file mode 100644
index 000000000..89f282703
--- /dev/null
+++ b/test/confs/0631
@@ -0,0 +1,40 @@
+# Exim test configuration 0631
+
+.include DIR/aux-var/std_conf_prefix
+
+primary_hostname = myhost.test.ex
+
+# ----- Main settings -----
+
+acl_smtp_mail = chk_mail
+acl_smtp_rcpt = chk_rcpt
+acl_smtp_data = chk_data
+
+# ----- ACL -----
+
+begin acl
+
+chk_mail:
+  accept control = debug/tag=_acl/opts=-all+acl/pretrigger=270
+  	 message = yes1
+  	 message = yes2
+  	 message = yes3
+  	 message = yes4
+  	 message = yes5
+  	 message = yes6
+
+chk_rcpt:
+  accept control = debug/trigger=now
+
+chk_data:
+  accept control = debug/stop
+
+# ----- Routers -----
+
+begin routers
+
+r0:
+    driver =	redirect
+    data =	:blackhole:
+#
+# End
diff --git a/test/log/0574 b/test/log/0628
index 1b544f951..1b544f951 100644
--- a/test/log/0574
+++ b/test/log/0628
diff --git a/test/log/0629 b/test/log/0629
new file mode 100644
index 000000000..6161c31ba
--- /dev/null
+++ b/test/log/0629
@@ -0,0 +1,3 @@
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
diff --git a/test/log/0630 b/test/log/0630
new file mode 100644
index 000000000..86dfe447e
--- /dev/null
+++ b/test/log/0630
@@ -0,0 +1,6 @@
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= test_3@paniclogrouter H=(test.ex) [127.0.0.1] P=esmtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 Tainted filename 'TESTSUITE/spool/dest3'
+1999-03-02 09:44:33 10HmaX-0005vi-00 failed to open TESTSUITE/spool/dest3 when checking "$spool_directory/$local_part": Permission denied (euid=uuuu egid=EXIM_GID)
diff --git a/test/log/0631 b/test/log/0631
new file mode 100644
index 000000000..d7e5e70fc
--- /dev/null
+++ b/test/log/0631
@@ -0,0 +1,6 @@
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= test_3@paniclogrouter H=(test.ex) [127.0.0.1] P=esmtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <dest3@test.ex> R=r0
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/paniclog/0629 b/test/paniclog/0629
new file mode 100644
index 000000000..b51843e1c
--- /dev/null
+++ b/test/paniclog/0629
@@ -0,0 +1,3 @@
+
+******** SERVER ********
+1999-03-02 09:44:33 H=(test.ex) [127.0.0.1] F=<test_2@paniclogrcpt> rejected RCPT <dest2@test.ex>
diff --git a/test/paniclog/0630 b/test/paniclog/0630
new file mode 100644
index 000000000..6e72b86ed
--- /dev/null
+++ b/test/paniclog/0630
@@ -0,0 +1,4 @@
+
+******** SERVER ********
+1999-03-02 09:44:33 10HmaX-0005vi-00 Tainted filename 'TESTSUITE/spool/dest3'
+1999-03-02 09:44:33 10HmaX-0005vi-00 failed to open TESTSUITE/spool/dest3 when checking "$spool_directory/$local_part": Permission denied (euid=uuuu egid=EXIM_GID)
diff --git a/test/runtest b/test/runtest
index 8e3a1f42c..051508eca 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1929,12 +1929,6 @@ $munges =
     { 'mainlog'   => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1<suppressed>/',
       'rejectlog' => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1<suppressed>/'},
 
-    'debuglog_stdout' =>
-    { 'stdout' => 's/^\d\d:\d\d:\d\d\s+\d+ //;
-                  s/Process \d+ is ready for new message/Process pppp is ready for new message/;
-		  s/^(?:daemon-accept forked for daemon-accept-delivery:|forked delivery process) \K\d+$/pppp/;'
-    },
-
     'timeout_errno' =>		# actual errno differs Solaris vs. Linux
     { 'mainlog' => 's/((?:host|message) deferral .* errno) <\d+> /$1 <EEE> /' },
 
diff --git a/test/scripts/0000-Basic/0574 b/test/scripts/0000-Basic/0628
index d227b5acc..d227b5acc 100644
--- a/test/scripts/0000-Basic/0574
+++ b/test/scripts/0000-Basic/0628
diff --git a/test/scripts/0000-Basic/0629 b/test/scripts/0000-Basic/0629
new file mode 100644
index 000000000..758b7b1a6
--- /dev/null
+++ b/test/scripts/0000-Basic/0629
@@ -0,0 +1,26 @@
+# debug logging ACL modifier, pretrigger
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+#
+client 127.0.0.1 PORT_D
+??? 220
+EHLO test.ex
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250 
+MAIL FROM:<test_2@paniclogrcpt>
+??? 250
+RCPT TO:<dest2@test.ex>
+??? 550
+QUIT
+??? 221
+****
+#
+killdaemon
+#
+cp DIR/spool/log/serverdebuglog_rcpt /dev/stderr
+#
+no_msglog_check
diff --git a/test/scripts/0000-Basic/0630 b/test/scripts/0000-Basic/0630
new file mode 100644
index 000000000..55a5290ba
--- /dev/null
+++ b/test/scripts/0000-Basic/0630
@@ -0,0 +1,30 @@
+# debug logging ACL modifier, trigger in router
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+#
+client 127.0.0.1 PORT_D
+??? 220
+EHLO test.ex
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250 
+MAIL FROM:<test_3@paniclogrouter>
+??? 250
+RCPT TO:<dest3@test.ex>
+??? 250
+DATA
+??? 354
+.
+??? 250
+QUIT
+??? 221
+****
+#
+killdaemon
+#
+cp DIR/spool/log/serverdebuglog_router /dev/stderr
+#
+no_msglog_check
diff --git a/test/scripts/0000-Basic/0631 b/test/scripts/0000-Basic/0631
new file mode 100644
index 000000000..75cf31f35
--- /dev/null
+++ b/test/scripts/0000-Basic/0631
@@ -0,0 +1,30 @@
+# debug logging ACL modifier, pretrigger, trigger by ACL command
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+#
+client 127.0.0.1 PORT_D
+??? 220
+EHLO test.ex
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250 
+MAIL FROM:<test_3@paniclogrouter>
+??? 250
+RCPT TO:<dest3@test.ex>
+??? 250
+DATA
+??? 354
+.
+??? 250
+QUIT
+??? 221
+****
+#
+killdaemon
+#
+cp DIR/spool/log/serverdebuglog_acl /dev/stderr
+#
+no_msglog_check
diff --git a/test/stderr/0574 b/test/stderr/0628
index ab3ddcb3b..ab3ddcb3b 100644
--- a/test/stderr/0574
+++ b/test/stderr/0628
diff --git a/test/stderr/0629 b/test/stderr/0629
new file mode 100644
index 000000000..ad96aa70e
--- /dev/null
+++ b/test/stderr/0629
@@ -0,0 +1,22 @@
+accept: condition test succeeded in ACL "chk_mail"
+end of ACL "chk_mail": ACCEPT
+SMTP>> 250 OK
+SMTP<< RCPT TO:<dest2@test.ex>
+using ACL "chk_rcpt"
+processing "deny" (TESTSUITE/test-config 20)
+check log_reject_target = panic
+deny: condition test succeeded in ACL "chk_rcpt"
+end of ACL "chk_rcpt": DENY
+SMTP>> 550 Administrative prohibition
+LOG: PANIC
+  H=(test.ex) [127.0.0.1] F=<test_2@paniclogrcpt> rejected RCPT <dest2@test.ex>
+SMTP<< QUIT
+SMTP>> 221 myhost.test.ex closing connection
+LOG: smtp_connection MAIN
+  SMTP connection from (test.ex) [127.0.0.1] closed by QUIT
+search_tidyup called
+SMTP>>(close on process exit)
+>>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
+
+******** SERVER ********
+1999-03-02 09:44:33 H=(test.ex) [127.0.0.1] F=<test_2@paniclogrcpt> rejected RCPT <dest2@test.ex>
diff --git a/test/stderr/0630 b/test/stderr/0630
new file mode 100644
index 000000000..271f4499b
--- /dev/null
+++ b/test/stderr/0630
@@ -0,0 +1,46 @@
+01:01:01 1234 reading spool file 10HmaX-0005vi-00-H
+01:01:01 1234 user=EXIMUSER uid=EXIM_UID gid=EXIM_GID sender=test_3@paniclogrouter
+01:01:01 1234 sender_fullhost = (test.ex) [127.0.0.1]
+01:01:01 1234 sender_rcvhost = [127.0.0.1] (helo=test.ex)
+01:01:01 1234 sender_local=0 ident=unset
+01:01:01 1234 Non-recipients:
+01:01:01 1234  Empty Tree
+01:01:01 1234 ---- End of tree ----
+01:01:01 1234 recipients_count=1
+01:01:01 1234 **** SPOOL_IN - No additional fields
+01:01:01 1234 body_linecount=0 message_linecount=6
+01:01:01 1234 DSN: set orcpt:   flags: 0x0
+01:01:01 1234 Delivery address list:
+01:01:01 1234   dest3@test.ex 
+01:01:01 1234  locking TESTSUITE/spool/db/retry.lockfile
+01:01:01 1234  locked  TESTSUITE/spool/db/retry.lockfile
+01:01:01 1234  EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
+01:01:01 1234  returned from EXIM_DBOPEN: (nil)
+01:01:01 1234  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
+01:01:01 1234 no retry data available
+01:01:01 1234 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+01:01:01 1234 Considering: dest3@test.ex
+01:01:01 1234 unique = dest3@test.ex
+01:01:01 1234 no   domain  retry record
+01:01:01 1234 no   address retry record
+01:01:01 1234 dest3@test.ex: queued for routing
+01:01:01 1234 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+01:01:01 1234 routing dest3@test.ex
+01:01:01 1234 --------> r0 router <--------
+01:01:01 1234 local_part=dest3 domain=test.ex
+01:01:01 1234 checking local_parts
+01:01:01 1234  ╭considering: $spool_directory/$local_part
+01:01:01 1234  ├considering: /$local_part
+01:01:01 1234  ├───────text: /
+01:01:01 1234  ├considering: $local_part
+01:01:01 1234  ├──expanding: $spool_directory/$local_part
+01:01:01 1234  ╰─────result: TESTSUITE/spool/dest3
+01:01:01 1234             ╰──(tainted)
+01:01:01 1234 LOG: MAIN PANIC
+01:01:01 1234   Tainted filename 'TESTSUITE/spool/dest3'
+01:01:01 1234 LOG: MAIN PANIC DIE
+01:01:01 1234   failed to open TESTSUITE/spool/dest3 when checking "$spool_directory/$local_part": Permission denied (euid=uuuu egid=EXIM_GID)
+01:01:01 1234 search_tidyup called
+01:01:01 1234 >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept-delivery) terminating with rc=1 >>>>>>>>>>>>>>>>
+
+******** SERVER ********
diff --git a/test/stderr/0631 b/test/stderr/0631
new file mode 100644
index 000000000..f0dc9300e
--- /dev/null
+++ b/test/stderr/0631
@@ -0,0 +1,16 @@
+  message: yes3
+  message: yes4
+  message: yes5
+  message: yes6
+accept: condition test succeeded in ACL "chk_mail"
+end of ACL "chk_mail": ACCEPT
+using ACL "chk_rcpt"
+processing "accept" (TESTSUITE/test-config 27)
+check control = debug/trigger=now
+accept: condition test succeeded in ACL "chk_rcpt"
+end of ACL "chk_rcpt": ACCEPT
+using ACL "chk_data"
+processing "accept" (TESTSUITE/test-config 30)
+check control = debug/stop
+
+******** SERVER ********
diff --git a/test/stdout/0574 b/test/stdout/0628
index 7311e2d77..7311e2d77 100644
--- a/test/stdout/0574
+++ b/test/stdout/0628
diff --git a/test/stdout/0629 b/test/stdout/0629
new file mode 100644
index 000000000..eaa8463ce
--- /dev/null
+++ b/test/stdout/0629
@@ -0,0 +1,24 @@
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> EHLO test.ex
+??? 250-
+<<< 250-myhost.test.ex Hello test.ex [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250 
+<<< 250 HELP
+>>> MAIL FROM:<test_2@paniclogrcpt>
+??? 250
+<<< 250 OK
+>>> RCPT TO:<dest2@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/0630 b/test/stdout/0630
new file mode 100644
index 000000000..8aec05945
--- /dev/null
+++ b/test/stdout/0630
@@ -0,0 +1,30 @@
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> EHLO test.ex
+??? 250-
+<<< 250-myhost.test.ex Hello test.ex [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250 
+<<< 250 HELP
+>>> MAIL FROM:<test_3@paniclogrouter>
+??? 250
+<<< 250 OK
+>>> RCPT TO:<dest3@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/0631 b/test/stdout/0631
new file mode 100644
index 000000000..5ca8747c8
--- /dev/null
+++ b/test/stdout/0631
@@ -0,0 +1,30 @@
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> EHLO test.ex
+??? 250-
+<<< 250-myhost.test.ex Hello test.ex [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250 
+<<< 250 HELP
+>>> MAIL FROM:<test_3@paniclogrouter>
+??? 250
+<<< 250 yes6
+>>> RCPT TO:<dest3@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script