Ensure acl_not_smtp_start is called for -bS input.

10 files changed, 47 insertions, 0 deletions

diff --git a/test/confs/0535 b/test/confs/0535
index 6504807f9..a45a374b7 100644
--- a/test/confs/0535
+++ b/test/confs/0535
@@ -24,6 +24,7 @@ one:
        control = suppress_local_fixups
        add_header = X-Added: $recipients
 
+
 # ----- Routers -----
 
 begin routers
diff --git a/test/confs/0548 b/test/confs/0548
index 18ef2abdd..6306943de 100644
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -15,6 +15,7 @@ gecos_name = CALLER_NAME
 acl_smtp_connect = acl_connect
 acl_smtp_rcpt = acl_rcpt
 qualify_domain = test.ex
+queue_run_in_order
 
 
 # ----- ACLs -----
diff --git a/test/log/0535 b/test/log/0535
index e737ee232..b4e13c806 100644
--- a/test/log/0535
+++ b/test/log/0535
@@ -4,3 +4,9 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= nofix@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= x@y U=CALLER P=local-bsmtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= nofix@test.ex U=CALLER P=local-bsmtp S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
diff --git a/test/mail/0535.userx b/test/mail/0535.userx
index 4ca2d6156..e3994508e 100644
--- a/test/mail/0535.userx
+++ b/test/mail/0535.userx
@@ -18,3 +18,23 @@ X-Added: userx@test.ex
 
 No headers supplied.
 
+From x@y Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local-bsmtp (Exim x.yz)
+	(envelope-from <x@y>)
+	id 10HmaZ-0005vi-00
+	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: x@y
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+No headers supplied.
+
+From nofix@test.ex Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local-bsmtp (Exim x.yz)
+	(envelope-from <nofix@test.ex>)
+	id 10HmbA-0005vi-00
+	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+X-Added: userx@test.ex
+
+No headers supplied.
+
diff --git a/test/scripts/0000-Basic/0535 b/test/scripts/0000-Basic/0535
index 237fa4c9c..72a1a1533 100644
--- a/test/scripts/0000-Basic/0535
+++ b/test/scripts/0000-Basic/0535
@@ -5,3 +5,15 @@ No headers supplied.
 exim -odi -f nofix@test.ex userx@test.ex
 No headers supplied.
 ****
+exim -odi -bS
+mail from:<x@y>
+rcpt to:<userx@test.ex>
+data
+No headers supplied.
+.
+mail from:<nofix@test.ex>
+rcpt to:<userx@test.ex>
+data
+No headers supplied.
+.
+****
diff --git a/test/stderr/0381 b/test/stderr/0381
index bca2de5bf..a026767b8 100644
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -13,6 +13,7 @@ sender address = NULL
 sender_fullhost = [V4NET.99.99.97]
 sender_rcvhost = [V4NET.99.99.97] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [V4NET.99.99.97] via -oMa
+set_process_info: pppp accepting a local SMTP message from <CALLER>
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
diff --git a/test/stderr/0386 b/test/stderr/0386
index 8ff9bda89..a06f5294a 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -133,6 +133,7 @@ sender address = NULL
 sender_fullhost = [V4NET.11.12.13]
 sender_rcvhost = [V4NET.11.12.13] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [V4NET.11.12.13] via -oMa
+set_process_info: pppp accepting a local SMTP message from <CALLER>
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
diff --git a/test/stderr/0465 b/test/stderr/0465
index f429e3c47..4c84b1453 100644
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -10,6 +10,7 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
+set_process_info: pppp accepting a local SMTP message from <CALLER>
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
@@ -40,6 +41,7 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
+set_process_info: pppp accepting a local SMTP message from <CALLER>
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
@@ -101,6 +103,7 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
+set_process_info: pppp accepting a local SMTP message from <CALLER>
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
diff --git a/test/stderr/0487 b/test/stderr/0487
index 584672a7e..73c10e891 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -12,6 +12,7 @@ seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
+set_process_info: pppp accepting a local SMTP message from <CALLER>
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
diff --git a/test/stderr/3400 b/test/stderr/3400
index a2cc076ef..896c60266 100644
--- a/test/stderr/3400
+++ b/test/stderr/3400
@@ -368,6 +368,7 @@ sender address = NULL
 sender_fullhost = [10.0.0.5]
 sender_rcvhost = [10.0.0.5] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [10.0.0.5] via -oMa
+set_process_info: pppp accepting a local SMTP message from <CALLER>
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER