diff options
Diffstat (limited to 'test/stderr')
| -rw-r--r-- | test/stderr/0402 | 21 | ||||
| -rw-r--r-- | test/stderr/0432 | 4 | ||||
| -rw-r--r-- | test/stderr/0544 | 21 | ||||
| -rw-r--r-- | test/stderr/5403 | 2 | ||||
| -rw-r--r-- | test/stderr/5410 | 63 | ||||
| -rw-r--r-- | test/stderr/5420 | 63 | ||||
| -rw-r--r-- | test/stderr/5840 | 2 |
7 files changed, 60 insertions, 116 deletions
diff --git a/test/stderr/0402 b/test/stderr/0402 index 96f012a15..566e12843 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -46,8 +46,7 @@ considering: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -55,8 +54,7 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost result: false scanning: from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -66,22 +64,19 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost skipping: result is not used considering: ${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} condition: def:sender_ident result: true considering: 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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -92,8 +87,7 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name condition: def:sender_helo_name result: false scanning: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -146,8 +140,7 @@ considering: (envelope-from <$sender_address>) skipping: result is not used expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} diff --git a/test/stderr/0432 b/test/stderr/0432 index 885d62f0e..2fe0ca868 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -255,7 +255,7 @@ MUNGED: ::1 will be omitted in what follows >>> callout cache: no domain record found for b >>> callout cache: no address record found for a@b >>> interface=NULL port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... >>> connected +>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex @@ -300,7 +300,7 @@ MUNGED: ::1 will be omitted in what follows >>> callout cache: no domain record found for q >>> callout cache: no address record found for p1@q >>> interface=NULL port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... >>> connected +>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/0544 b/test/stderr/0544 index f950e456c..c52ab16ff 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -6,8 +6,7 @@ considering: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -15,8 +14,7 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost result: false scanning: from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -26,22 +24,19 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost skipping: result is not used considering: ${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} condition: def:sender_ident result: true considering: 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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -52,8 +47,7 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name condition: def:sender_helo_name result: false scanning: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -106,8 +100,7 @@ considering: (envelope-from <$sender_address>) skipping: result is not used expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} diff --git a/test/stderr/5403 b/test/stderr/5403 index 3c09ea605..dfb5a97e4 100644 --- a/test/stderr/5403 +++ b/test/stderr/5403 @@ -69,7 +69,7 @@ MUNGED: ::1 will be omitted in what follows >>> Attempting full verification using callout >>> callout cache: disabled by no_cache >>> interface=ip4.ip4.ip4.ip4 port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... >>> connected +>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/5410 b/test/stderr/5410 index 7916518b7..93d1d0eb2 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -134,8 +134,7 @@ considering: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -143,8 +142,7 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost result: false scanning: from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -154,22 +152,19 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost skipping: result is not used considering: ${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} condition: def:sender_ident result: true considering: 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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -180,8 +175,7 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name condition: def:sender_helo_name result: true considering: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -233,8 +227,7 @@ considering: for userx@domain.com expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -365,8 +358,7 @@ considering: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -374,8 +366,7 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost result: false scanning: from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -385,22 +376,19 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost skipping: result is not used considering: ${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} condition: def:sender_ident result: true considering: 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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -411,8 +399,7 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name condition: def:sender_helo_name result: true considering: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -464,8 +451,7 @@ considering: for usery@domain.com expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -596,8 +582,7 @@ considering: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -605,8 +590,7 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost result: false scanning: from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -616,22 +600,19 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost skipping: result is not used considering: ${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} condition: def:sender_ident result: true considering: 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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -642,8 +623,7 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name condition: def:sender_helo_name result: true considering: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -695,8 +675,7 @@ considering: for usery@domain.com expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} diff --git a/test/stderr/5420 b/test/stderr/5420 index a12451575..2817bdc33 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -133,8 +133,7 @@ considering: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -142,8 +141,7 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost result: false scanning: from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -153,22 +151,19 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost skipping: result is not used considering: ${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} condition: def:sender_ident result: true considering: 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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -179,8 +174,7 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name condition: def:sender_helo_name result: true considering: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -232,8 +226,7 @@ considering: for userx@domain.com expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -364,8 +357,7 @@ considering: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -373,8 +365,7 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost result: false scanning: from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -384,22 +375,19 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost skipping: result is not used considering: ${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} condition: def:sender_ident result: true considering: 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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -410,8 +398,7 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name condition: def:sender_helo_name result: true considering: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -463,8 +450,7 @@ considering: for usery@domain.com expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -595,8 +581,7 @@ considering: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -604,8 +589,7 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost result: false scanning: from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -615,22 +599,19 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost skipping: result is not used considering: ${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} condition: def:sender_ident result: true considering: 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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -641,8 +622,7 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name condition: def:sender_helo_name result: true considering: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -694,8 +674,7 @@ considering: for usery@domain.com expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${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_cipher {($tls_cipher) - }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} diff --git a/test/stderr/5840 b/test/stderr/5840 index 556a26bb5..b4b035a29 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -18,7 +18,7 @@ >>> callout cache: no domain record found for dane256ee.test.ex >>> callout cache: no address record found for CALLER@dane256ee.test.ex >>> interface=NULL port=1225 ->>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... >>> connected +>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected MUNGED: ::1 will be omitted in what follows >>> get[host|ipnode]byname[2] looked up these IP addresses: >>> name=thishost.test.ex address=127.0.0.1 |