Skip to content

Commit

Permalink
Testsuite: disentangle deliveries
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeremy Harris committed Feb 4, 2025
1 parent cd43f5e commit 7a3aaee
Show file tree
Hide file tree
Showing 15 changed files with 191 additions and 191 deletions.
4 changes: 2 additions & 2 deletions test/confs/3400
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ smtp_accept_max_nonmail = 20
system_filter = DIR/aux-fixed/TESTNUM.filter
trusted_users = CALLER

log_selector = +protocol_detail
log_selector = +protocol_detail +received_recipients

# ----- ACL -----

Expand Down Expand Up @@ -145,7 +145,7 @@ fail_remote_domains:

localuser:
driver = accept
local_parts = userx
local_parts = ^userx
transport = appendfile


Expand Down
42 changes: 21 additions & 21 deletions test/log/3400
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= [email protected] H=(testclient.ex) [10.0.0.3] U=CALLER P=esmtp S=sss
1999-03-02 09:44:33 10HmaX-000000005vi-0000 => userx <userx@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= [email protected] H=(testclient.ex) [10.0.0.3] U=CALLER P=esmtp S=sss for [email protected]
1999-03-02 09:44:33 10HmaX-000000005vi-0000 => userx6 <userx6@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
1999-03-02 09:44:33 ignoring [email protected] from H=(testclient.ex) [10.0.0.3] U=CALLER (client not authenticated)
1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= [email protected] H=(testclient.ex) [10.0.0.3] U=CALLER P=esmtp S=sss
1999-03-02 09:44:33 10HmaY-000000005vi-0000 => userx <userx@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= [email protected] H=(testclient.ex) [10.0.0.3] U=CALLER P=esmtp S=sss for [email protected]
1999-03-02 09:44:33 10HmaY-000000005vi-0000 => userx7 <userx7@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= [email protected] H=(testclient.ex) [10.0.0.3] U=CALLER P=esmtpa A=mylogin S=sss
1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => userx <userx@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= [email protected] H=(testclient.ex) [10.0.0.3] U=CALLER P=esmtpa A=mylogin S=sss for [email protected]
1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => userx8 <userx8@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Completed
1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= [email protected] H=(testclient.ex) [10.0.0.3] U=CALLER P=esmtpa A=mylogin S=sss
1999-03-02 09:44:33 10HmbA-000000005vi-0000 => userx <userx@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= [email protected] H=(testclient.ex) [10.0.0.3] U=CALLER P=esmtpa A=mylogin S=sss for [email protected]
1999-03-02 09:44:33 10HmbA-000000005vi-0000 => userx9 <userx9@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed
1999-03-02 09:44:33 10HmbB-000000005vi-0000 <= [email protected] H=(testclient.ex) [10.0.0.3] U=CALLER P=esmtpa A=mylogin S=sss
1999-03-02 09:44:33 10HmbB-000000005vi-0000 => userx <userx@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbB-000000005vi-0000 <= [email protected] H=(testclient.ex) [10.0.0.3] U=CALLER P=esmtpa A=mylogin S=sss for [email protected]
1999-03-02 09:44:33 10HmbB-000000005vi-0000 => userx10 <userx10@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbB-000000005vi-0000 Completed
1999-03-02 09:44:33 defer authenticator failed for (test.host) [10.0.0.1] U=CALLER: 435 Unable to authenticate at present (set_id=userx): account suspended
1999-03-02 09:44:33 plain authenticator failed for (test.host) [10.0.0.1] U=CALLER: 535 Incorrect authentication data
1999-03-02 09:44:33 10HmbC-000000005vi-0000 <= [email protected] H=(test.host) [10.0.0.1] U=CALLER P=esmtpa A=login:userx S=sss
1999-03-02 09:44:33 10HmbC-000000005vi-0000 => userx <userx@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbC-000000005vi-0000 <= [email protected] H=(test.host) [10.0.0.1] U=CALLER P=esmtpa A=login:userx S=sss for [email protected]
1999-03-02 09:44:33 10HmbC-000000005vi-0000 => userx11 <userx11@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbC-000000005vi-0000 Completed
1999-03-02 09:44:33 login authenticator failed for (test.host) [10.0.0.1] U=CALLER: 501 Authentication cancelled
1999-03-02 09:44:33 plain authenticator failed for (test.host) [10.0.0.1] U=CALLER: 535 Incorrect authentication data (set_id=eserx)
1999-03-02 09:44:33 acl_c0: 'userx'
1999-03-02 09:44:33 10HmbD-000000005vi-0000 <= [email protected] H=(test.host) [10.0.0.1] U=CALLER P=esmtpa A=expanded_prompt_plain:userx S=sss
1999-03-02 09:44:33 10HmbD-000000005vi-0000 <= [email protected] H=(test.host) [10.0.0.1] U=CALLER P=esmtpa A=expanded_prompt_plain:userx S=sss for [email protected]
1999-03-02 09:44:33 10HmbD-000000005vi-0000 => userx12 <[email protected]> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbD-000000005vi-0000 Completed
1999-03-02 09:44:33 expanded_prompt_plain_fail authenticator failed for (test.host) [10.0.0.1] U=CALLER: 435 Unable to authenticate at present: unknown variable name "nonexistent"
1999-03-02 09:44:33 expanded_prompt_plain authenticator failed for (test.host) [10.0.0.1] U=CALLER: 535 Incorrect authentication data (set_id=userx)
1999-03-02 09:44:33 expanded_prompt_plain authenticator failed for (test.host) [10.0.0.1] U=CALLER: 535 Incorrect authentication data (set_id=userx)
Expand All @@ -46,15 +48,13 @@
1999-03-02 09:44:33 expanded_prompt_plain authenticator failed for (test.host) [10.0.0.1] U=CALLER: 535 Incorrect authentication data (set_id=userx)
1999-03-02 09:44:33 expanded_prompt_plain authenticator failed for (test.host) [10.0.0.1] U=CALLER: 535 Incorrect authentication data (set_id=userx)
1999-03-02 09:44:33 SMTP call from (test.host) [10.0.0.1] U=CALLER dropped: too many nonmail commands (last was "auth")
1999-03-02 09:44:33 10HmbE-000000005vi-0000 <= x@y H=(testing.testing) [10.0.0.5] U=CALLER P=esmtp S=sss
1999-03-02 09:44:33 10HmbD-000000005vi-0000 => userx <[email protected]> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbD-000000005vi-0000 Completed
1999-03-02 09:44:33 10HmbE-000000005vi-0000 => userx <[email protected]> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbE-000000005vi-0000 <= x@y H=(testing.testing) [10.0.0.5] U=CALLER P=esmtp S=sss for [email protected]
1999-03-02 09:44:33 10HmbE-000000005vi-0000 => userx13 <[email protected]> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbE-000000005vi-0000 Completed
1999-03-02 09:44:33 10HmbF-000000005vi-0000 <= x@y H=(testing.testing) [10.0.0.5] U=CALLER P=esmtpa A=mylogin S=sss
1999-03-02 09:44:33 10HmbF-000000005vi-0000 => userx <userx@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbF-000000005vi-0000 <= x@y H=(testing.testing) [10.0.0.5] U=CALLER P=esmtpa A=mylogin S=sss for [email protected]
1999-03-02 09:44:33 10HmbF-000000005vi-0000 => userx14 <userx14@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbF-000000005vi-0000 Completed
1999-03-02 09:44:33 10HmbG-000000005vi-0000 <= x@y H=(testing.testing) [10.0.0.5] U=CALLER P=esmtpa A=mylogin S=sss
1999-03-02 09:44:33 10HmbG-000000005vi-0000 => userx <userx@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbG-000000005vi-0000 <= x@y H=(testing.testing) [10.0.0.5] U=CALLER P=esmtpa A=mylogin S=sss for [email protected]
1999-03-02 09:44:33 10HmbG-000000005vi-0000 => userx15 <userx15@test.ex> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbG-000000005vi-0000 Completed
1999-03-02 09:44:33 login authenticator failed for (test.host) [10.0.0.1] U=CALLER: 535 Incorrect authentication data
143 changes: 0 additions & 143 deletions test/mail/3400.userx
View file

This file was deleted.

14 changes: 14 additions & 0 deletions test/mail/3400.userx10
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
From [email protected] Tue Mar 02 09:44:33 1999
Return-path: <[email protected]>
Envelope-to: [email protected]
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
by myhost.test.ex with esmtpa (Exim x.yz)
(envelope-from <[email protected]>)
id 10HmbB-000000005vi-0000
for [email protected];
Tue, 2 Mar 1999 09:44:33 +0000
X-Host-Authenticated: mylogin

Testing authenticated (3).

15 changes: 15 additions & 0 deletions test/mail/3400.userx11
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
From [email protected] Tue Mar 02 09:44:33 1999
Return-path: <[email protected]>
Envelope-to: [email protected]
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from [10.0.0.1] (helo=test.host ident=CALLER)
by myhost.test.ex with esmtpa (Exim x.yz)
(envelope-from <[email protected]>)
id 10HmbC-000000005vi-0000
for [email protected];
Tue, 2 Mar 1999 09:44:33 +0000
X-Host-Authenticated: login
X-Authenticated-ID: userx

Testing authenticated.

15 changes: 15 additions & 0 deletions test/mail/3400.userx12
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
From [email protected] Tue Mar 02 09:44:33 1999
Return-path: <[email protected]>
Envelope-to: [email protected]
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from [10.0.0.1] (helo=test.host ident=CALLER)
by myhost.test.ex with esmtpa (Exim x.yz)
(envelope-from <[email protected]>)
id 10HmbD-000000005vi-0000
for [email protected];
Tue, 2 Mar 1999 09:44:33 +0000
X-Host-Authenticated: expanded_prompt_plain
X-Authenticated-ID: userx

Testing authenticated.

14 changes: 14 additions & 0 deletions test/mail/3400.userx13
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
From x@y Tue Mar 02 09:44:33 1999
Return-path: <x@y>
Envelope-to: [email protected]
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from [10.0.0.5] (helo=testing.testing ident=CALLER)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmbE-000000005vi-0000
for [email protected];
Tue, 2 Mar 1999 09:44:33 +0000
authentication-failed: 0

Without authenticating

15 changes: 15 additions & 0 deletions test/mail/3400.userx14
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
From x@y Tue Mar 02 09:44:33 1999
Return-path: <x@y>
Envelope-to: [email protected]
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from [10.0.0.5] (helo=testing.testing ident=CALLER)
by myhost.test.ex with esmtpa (Exim x.yz)
(envelope-from <x@y>)
id 10HmbF-000000005vi-0000
for [email protected];
Tue, 2 Mar 1999 09:44:33 +0000
authentication-failed: 0
X-Host-Authenticated: mylogin

Authentication failed

15 changes: 15 additions & 0 deletions test/mail/3400.userx15
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
From x@y Tue Mar 02 09:44:33 1999
Return-path: <x@y>
Envelope-to: [email protected]
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from [10.0.0.5] (helo=testing.testing ident=CALLER)
by myhost.test.ex with esmtpa (Exim x.yz)
(envelope-from <x@y>)
id 10HmbG-000000005vi-0000
for [email protected];
Tue, 2 Mar 1999 09:44:33 +0000
authentication-failed: 1
X-Host-Authenticated: mylogin

Authentication succeeded

13 changes: 13 additions & 0 deletions test/mail/3400.userx6
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
From [email protected] Tue Mar 02 09:44:33 1999
Return-path: <[email protected]>
Envelope-to: [email protected]
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <[email protected]>)
id 10HmaX-000000005vi-0000
for [email protected];
Tue, 2 Mar 1999 09:44:33 +0000

Testing unauthenticated.

13 changes: 13 additions & 0 deletions test/mail/3400.userx7
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
From [email protected] Tue Mar 02 09:44:33 1999
Return-path: <[email protected]>
Envelope-to: [email protected]
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <[email protected]>)
id 10HmaY-000000005vi-0000
for [email protected];
Tue, 2 Mar 1999 09:44:33 +0000

Testing unauthenticated (2).

14 changes: 14 additions & 0 deletions test/mail/3400.userx8
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
From [email protected] Tue Mar 02 09:44:33 1999
Return-path: <[email protected]>
Envelope-to: [email protected]
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
by myhost.test.ex with esmtpa (Exim x.yz)
(envelope-from <[email protected]>)
id 10HmaZ-000000005vi-0000
for [email protected];
Tue, 2 Mar 1999 09:44:33 +0000
X-Host-Authenticated: mylogin

Testing authenticated.

15 changes: 15 additions & 0 deletions test/mail/3400.userx9
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
From [email protected] Tue Mar 02 09:44:33 1999
Return-path: <[email protected]>
Envelope-to: [email protected]
Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
by myhost.test.ex with esmtpa (Exim x.yz)
(envelope-from <[email protected]>)
id 10HmbA-000000005vi-0000
for [email protected];
Tue, 2 Mar 1999 09:44:33 +0000
X-Host-Authenticated: mylogin
X-Authenticated-Sender: [email protected]

Testing authenticated (2).

Loading

0 comments on commit 7a3aaee

Please sign in to comment.