Check for missing commandline arg after options taking one. Bug 3049

[exim.git] / test / rejectlog / 2137

diff --git a/test/rejectlog/2137 b/test/rejectlog/2137
index 6ec7345848d0c142772f20ba1ef3fcf12a6d07a9..b3b597a424f93f5e3738b481e5d7aa8e7827e436 100644 (file)
--- a/test/rejectlog/2137
+++ b/test/rejectlog/2137
@@ -1,20 +1,23 @@
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <rcpt_defer@test.ex>: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<rcpt_defer@test.ex>: 451 Temporary local problem - please try later
 
 ******** SERVER ********
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <rcpt_defer@test.ex>: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<rcpt_defer@test.ex>: 451 Temporary local problem - please try later
 
 ******** SERVER ********

-1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> temporarily rejected RCPT <rcpt_defer@test.ex>
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no F=<> temporarily rejected after DATA
+1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> temporarily rejected RCPT <rcpt_defer@test.ex>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> temporarily rejected after DATA

 Envelope-from: <>
 Envelope-to: <data_defer@test.ex>
 P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 Envelope-from: <>
 Envelope-to: <data_defer@test.ex>
 P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)

-       by myhost.test.ex with esmtps (TLSv1:AES256-SHA:256)
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)

        (Exim x.yz)
        (Exim x.yz)

-       id 10HmaX-0005vi-00
-       for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+       id 10HmaX-000000005vi-0000
+       for data_defer@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        (envelope-from <CALLER@myhost.test.ex>)

-       id 10HmaY-0005vi-00
-       for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaY-000000005vi-0000
+       for data_defer@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

   Subject: test
   Subject: test

-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>

 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000