git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Docs: more detail for DKIM
[exim.git] / test / stderr / 0402
diff --git a/test/stderr/0402 b/test/stderr/0402
index 4abead894fb8f4242d585342389fdf1cec67cbf8..8d6f16f952bd117928738d9ba7aab64c306ef08d 100644 (file)
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -36,12 +36,12 @@ rewrite headers
    From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
+I Message-Id: <E10HmaX-000000005vi-0000@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
-Data file written for message 10HmaX-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
+Data file written for message 10HmaX-000000005vi-0000
  ╭considering: ${tod_full}
  ├──expanding: ${tod_full}
  ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -77,6 +77,7 @@ Data file written for message 10HmaX-0005vi-00
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
+  ├──────value: 
   ├───scanning: 
        }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
        }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
@@ -124,6 +125,7 @@ Data file written for message 10HmaX-0005vi-00
    ╎ ${if def:sender_address {(envelope-from <$sender_address>)
    ╎ }}id $message_exim_id${if def:received_for {
    ╎ for $received_for}}
+   ╎├──────value: CALLER
    ╎├considering: } }}${if def:sender_helo_name {(helo=$sender_helo_name)
    ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
    ╎ }}(Exim $version_number)
@@ -170,6 +172,7 @@ Data file written for message 10HmaX-0005vi-00
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
+   ├──────value: 
    ├───scanning: )
        }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
@@ -209,6 +212,7 @@ Data file written for message 10HmaX-0005vi-00
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
+ ├──────value: mail.test.ex
  ├considering:  ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
@@ -233,6 +237,7 @@ Data file written for message 10HmaX-0005vi-00
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
+  ├──────value: local
   ├considering:  }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
@@ -252,6 +257,7 @@ Data file written for message 10HmaX-0005vi-00
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
+       ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
   ├──expanding:  ($tls_in_ver)
@@ -276,6 +282,7 @@ Data file written for message 10HmaX-0005vi-00
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
+  ├──────value: 
   ├───scanning: 
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
@@ -302,6 +309,7 @@ Data file written for message 10HmaX-0005vi-00
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
+ ├──────value: x.yz
  ├considering: )
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
@@ -320,6 +328,7 @@ Data file written for message 10HmaX-0005vi-00
   ├considering: $sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
+  ├──────value: CALLER@test.ex
   ├considering: >)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
@@ -338,6 +347,7 @@ Data file written for message 10HmaX-0005vi-00
  ├───────text: id 
  ├considering: $message_exim_id${if def:received_for {
        for $received_for}}
+ ├──────value: 10HmaX-000000005vi-0000
  ├considering: ${if def:received_for {
        for $received_for}}
  ├──condition: def:received_for
@@ -347,6 +357,7 @@ Data file written for message 10HmaX-0005vi-00
   ├───────text: 
        for 
   ├───scanning: $received_for}}
+  ├──────value: 
   ├───scanning: }}
   ├──expanding: 
        for $received_for
@@ -363,28 +374,28 @@ Data file written for message 10HmaX-0005vi-00
        for $received_for}}
  ╰─────result: Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaX-0005vi-00
+       id 10HmaX-000000005vi-0000
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaX-0005vi-00;
+       id 10HmaX-000000005vi-0000;
        Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: ${tod_full}
  ├──expanding: ${tod_full}
  ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
-Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <CALLER@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 DSN: **** SPOOL_OUT - address: <usery@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 DSN: **** SPOOL_OUT - address: <userz@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 DSN: **** SPOOL_OUT - address: <rd+CALLER@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 DSN: **** SPOOL_OUT - address: <rd+usery@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
-Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
+Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1235
@@ -402,9 +413,9 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
-set_process_info: pppp delivering 10HmaX-0005vi-00
-Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D
-reading spool file 10HmaX-0005vi-00-H
+set_process_info: pppp delivering 10HmaX-000000005vi-0000
+Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
+reading spool file 10HmaX-000000005vi-0000-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
@@ -505,6 +516,8 @@ usery in "usery"?
  ╭considering: /non-exist/$domain
  ├───────text: /non-exist/
  ├considering: $domain
+ ├──────value: test.ex
+            ╰──(tainted)
  ├──expanding: /non-exist/$domain
  ╰─────result: /non-exist/test.ex
             ╰──(tainted)
@@ -555,6 +568,8 @@ CALLER in "CALLER"?
  ╭considering: /non-exist/$local_part
  ├───────text: /non-exist/
  ├considering: $local_part
+ ├──────value: CALLER
+            ╰──(tainted)
  ├──expanding: /non-exist/$local_part
  ╰─────result: /non-exist/CALLER
             ╰──(tainted)
@@ -597,6 +612,8 @@ userz in "userz"?
  ╭considering: /non-exist/$domain
  ├───────text: /non-exist/
  ├considering: $domain
+ ├──────value: test.ex
+            ╰──(tainted)
  ├──expanding: /non-exist/$domain
  ╰─────result: /non-exist/test.ex
             ╰──(tainted)
@@ -629,6 +646,8 @@ usery in "usery"?
  ╭considering: /non-exist/$domain
  ├───────text: /non-exist/
  ├considering: $domain
+ ├──────value: test.ex
+            ╰──(tainted)
  ├──expanding: /non-exist/$domain
  ╰─────result: /non-exist/test.ex
             ╰──(tainted)
@@ -654,6 +673,8 @@ CALLER in "CALLER"?
  ╭considering: /non-exist/$local_part
  ├───────text: /non-exist/
  ├considering: $local_part
+ ├──────value: CALLER
+            ╰──(tainted)
  ├──expanding: /non-exist/$local_part
  ╰─────result: /non-exist/CALLER
             ╰──(tainted)
@@ -705,6 +726,8 @@ no retry data available
  ╭considering: /non-exist/$local_part
  ├───────text: /non-exist/
  ├considering: $local_part
+ ├──────value: usery
+            ╰──(tainted)
  ├──expanding: /non-exist/$local_part
  ╰─────result: /non-exist/usery
             ╰──(tainted)
@@ -712,9 +735,10 @@ search_tidyup called
 changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=ft1
   uid=CALLER_UID gid=CALLER_GID pid=p1236
   home=/non-exist/usery current=/
-set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using ft1
+set_process_info: pppp delivering 10HmaX-000000005vi-0000 to TESTSUITE/test-mail/junk using ft1
 appendfile transport entered
  ╭considering: $address_file
+ ├──────value: TESTSUITE/test-mail/junk
  ├──expanding: $address_file
  ╰─────result: TESTSUITE/test-mail/junk
 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
@@ -737,6 +761,8 @@ writing to file TESTSUITE/test-mail/junk
  ├─────result: true
   ╭considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox}
   
+  ├──────value: CALLER@test.ex
+             ╰──(tainted)
   ├considering: }{MAILER-DAEMON}} ${tod_bsdinbox}
   
   ├──expanding: $return_path
@@ -790,9 +816,10 @@ search_tidyup called
 changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=ft1
   uid=CALLER_UID gid=CALLER_GID pid=p1237
   home=/non-exist/CALLER current=/
-set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using ft1
+set_process_info: pppp delivering 10HmaX-000000005vi-0000 to TESTSUITE/test-mail/junk using ft1
 appendfile transport entered
  ╭considering: $address_file
+ ├──────value: TESTSUITE/test-mail/junk
  ├──expanding: $address_file
  ╰─────result: TESTSUITE/test-mail/junk
 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
@@ -815,6 +842,8 @@ writing to file TESTSUITE/test-mail/junk
  ├─────result: true
   ╭considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox}
   
+  ├──────value: CALLER@test.ex
+             ╰──(tainted)
   ├considering: }{MAILER-DAEMON}} ${tod_bsdinbox}
   
   ├──expanding: $return_path
@@ -868,7 +897,7 @@ search_tidyup called
 changed uid/gid: local delivery to CALLER <CALLER@test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=p1238
   home=/non-exist/CALLER current=/
-set_process_info: pppp delivering 10HmaX-0005vi-00 to CALLER using t1
+set_process_info: pppp delivering 10HmaX-000000005vi-0000 to CALLER using t1
 appendfile transport entered
 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   file=/dev/null format=unix
@@ -893,6 +922,8 @@ no retry data available
  ╭considering: /non-exist/$local_part
  ├───────text: /non-exist/
  ├considering: $local_part
+ ├──────value: usery
+            ╰──(tainted)
  ├──expanding: /non-exist/$local_part
  ╰─────result: /non-exist/usery
             ╰──(tainted)
@@ -900,7 +931,7 @@ search_tidyup called
 changed uid/gid: local delivery to usery <usery@test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=p1239
   home=/non-exist/usery current=/
-set_process_info: pppp delivering 10HmaX-0005vi-00 to usery using t1
+set_process_info: pppp delivering 10HmaX-000000005vi-0000 to usery using t1
 appendfile transport entered
 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   file=/dev/null format=unix
@@ -925,6 +956,8 @@ no retry data available
  ╭considering: /$local_part
  ├───────text: /
  ├considering: $local_part
+ ├──────value: userz
+            ╰──(tainted)
  ├──expanding: /$local_part
  ╰─────result: /userz
             ╰──(tainted)
@@ -932,7 +965,7 @@ search_tidyup called
 changed uid/gid: local delivery to userz <userz@test.ex> transport=t2
   uid=CALLER_UID gid=CALLER_GID pid=p1240
   home=/userz current=/
-set_process_info: pppp delivering 10HmaX-0005vi-00 to userz using t2
+set_process_info: pppp delivering 10HmaX-000000005vi-0000 to userz using t2
 appendfile transport entered
 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   file=/dev/null format=unix
@@ -950,7 +983,7 @@ LOG: MAIN
 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>
 changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1235
-set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
+set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
 Succeeded addresses:
  userz@test.ex: no retry items
@@ -1023,7 +1056,7 @@ DSN: Remote SMTP server supports DSN: 0
 DSN: not sending DSN success message
 LOG: MAIN
   Completed
-end delivery of 10HmaX-0005vi-00
+end delivery of 10HmaX-000000005vi-0000
 search_tidyup called
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Master Exim source repository