Fix string_copy() macro to not multiple-eval args. Bug 2603

[exim.git] / test / stderr / 4052

diff --git a/test/stderr/4052 b/test/stderr/4052
index 261c73ba7faa647c478e74a5a054841f9df4691f..cf06d963f5c3daae0ce4f8027d17cf7908800a8b 100644 (file)
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -18,9 +18,9 @@ checking status of 127.0.0.1
 no host retry record
 no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
-delivering 10HmbG-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@test.ex)
+delivering 10HmbP-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@test.ex)
 Transport port=25 replaced by host-specific port=1225
-EHLO response bits from cache: cleartext 0x0120 crypted 0x0000
+EHLO response bits from cache: cleartext 0x0120/0x0000 crypted 0x0000/0x0000
 Using cached cleartext PIPE_CONNECT
   SMTP>> EHLO the.local.host.name
 using PIPELINING
@@ -37,10 +37,10 @@ smtp_reap_early_pipe expect ehlo
   SMTP<< 250-esmtp-resp
          250-PIPELINING
          250-X_PIPE_CONNECT
-         250-STARTTLS
+         250-SIZE
          250 ok
-EHLO cleartext extensions changed, 0x0120/0x0000 -> 0x0121/0x0000
-writing clr 0121/0000 cry 0000/0000
+EHLO cleartext extensions changed, 0x0120/0x0000 -> 0x0160/0x0000
+writing clr 0160/0000 cry 0000/0000
 sync_responses expect mail
   SMTP<< 250 mail-from accepted
 sync_responses expect rcpt
@@ -63,7 +63,7 @@ LOG: MAIN
   => extchange@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 
 ******** SERVER ********