git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix logging of drop-after-EHLO-reject.
[exim.git]
/
test
/
stderr
/
0002
diff --git
a/test/stderr/0002
b/test/stderr/0002
index 19ed3479ae16cae053e3e0e7407b9e3c2f678458..e7c70cfbfde40bbb82719141cbb865c5af7e4a2f 100644
(file)
--- a/
test/stderr/0002
+++ b/
test/stderr/0002
@@
-11,8
+11,8
@@
considering: abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
expanding: \N^([ab]+)(\w+)$\N
result: ^([ab]+)(\w+)$
considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
expanding: \N^([ab]+)(\w+)$\N
result: ^([ab]+)(\w+)$
-condition: match{abcd}{\N^([ab]+)(\w+)$\N}
- result: true
+
condition: match{abcd}{\N^([ab]+)(\w+)$\N}
+
result: true
considering: $2$1}fail}
expanding: $2$1
result: cdab
considering: $2$1}fail}
expanding: $2$1
result: cdab
@@
-25,8
+25,8
@@
considering: wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
expanding: \N^([ab]+)(\w+)$\N
result: ^([ab]+)(\w+)$
considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
expanding: \N^([ab]+)(\w+)$\N
result: ^([ab]+)(\w+)$
-condition: match{wxyz}{\N^([ab]+)(\w+)$\N}
- result: false
+
condition: match{wxyz}{\N^([ab]+)(\w+)$\N}
+
result: false
scanning: $2$1}fail}
expanding: $2$1
result:
scanning: $2$1}fail}
expanding: $2$1
result:
@@
-41,8
+41,8
@@
considering: 1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
considering: 1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
expanding: 1
result: 1
considering: 1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
expanding: 1
result: 1
-condition: eq {1}{1}
- result: true
+
condition: eq {1}{1}
+
result: true
considering: yes}{${lookup{xx}lsearch{/non/exist}}}}
expanding: yes
result: yes
considering: yes}{${lookup{xx}lsearch{/non/exist}}}}
expanding: yes
result: yes
@@
-69,8
+69,8
@@
considering: a.b.c}{yes}{no}}
result: a.b.c
LOG: MAIN PANIC
no @ found in the subject of an address list match: subject="a.b.c" pattern="a.b.c"
result: a.b.c
LOG: MAIN PANIC
no @ found in the subject of an address list match: subject="a.b.c" pattern="a.b.c"
-condition: match_address{a.b.c}{a.b.c}
- result: false
+
condition: match_address{a.b.c}{a.b.c}
+
result: false
scanning: yes}{no}}
expanding: yes
result: yes
scanning: yes}{no}}
expanding: yes
result: yes
@@
-147,8
+147,8
@@
considering: black}{white}{$sender_host_name}{No}}
considering: white}{$sender_host_name}{No}}
expanding: white
result: white
considering: white}{$sender_host_name}{No}}
expanding: white
result: white
-condition: eq{black}{white}
- result: false
+
condition: eq{black}{white}
+
result: false
scanning: $sender_host_name}{No}}
expanding: $sender_host_name
result:
scanning: $sender_host_name}{No}}
expanding: $sender_host_name
result:
@@
-227,7
+227,7
@@
host in "<
deny: condition test succeeded in ACL "connect1"
end of ACL "connect1": DENY
SMTP>> 550 Administrative prohibition
deny: condition test succeeded in ACL "connect1"
end of ACL "connect1": DENY
SMTP>> 550 Administrative prohibition
-LOG: MAIN REJECT
+LOG:
connection_reject
MAIN REJECT
H=ten-1.test.ex [V4NET.0.0.1] rejected connection in "connect" ACL
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
H=ten-1.test.ex [V4NET.0.0.1] rejected connection in "connect" ACL
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@
-271,7
+271,7
@@
host in "net-lsearch;TESTSUITE/aux-fixed/0002.lsearch"? no (end of list)
deny: condition test failed in ACL "connect2"
end of ACL "connect2": implicit DENY
SMTP>> 550 Administrative prohibition
deny: condition test failed in ACL "connect2"
end of ACL "connect2": implicit DENY
SMTP>> 550 Administrative prohibition
-LOG: MAIN REJECT
+LOG:
connection_reject
MAIN REJECT
H=[V4NET.0.0.2] rejected connection in "connect" ACL
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
H=[V4NET.0.0.2] rejected connection in "connect" ACL
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>