X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/7373d852aafa227745f392555f2e1d24ec24d4b2..c39b93a62e182a09450f212b03705dcafa7431aa:/test/stderr/0544 diff --git a/test/stderr/0544 b/test/stderr/0544 index c52ab16ff..edbfb61f7 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -6,7 +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 }}(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}} @@ -14,7 +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 }}(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}} @@ -24,19 +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 }}(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 }}(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 }}(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}} @@ -47,7 +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 }}(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}} @@ -61,25 +61,12 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name result: from CALLER condition: def:received_protocol result: true -considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) +considering: 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}} expanding: with $received_protocol result: with local - condition: def:tls_cipher - result: false - scanning: ($tls_cipher) - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - expanding: ($tls_cipher) - - result: () - - skipping: result is not used condition: def:sender_address result: true considering: (envelope-from <$sender_address>) @@ -100,7 +87,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 }}(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}}