From 398f9af3b35c79d142dcbfd7b56758eea88c8f43 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 12 Feb 2017 16:30:28 +0000 Subject: [PATCH 1/1] Debug: avoid indenting line-prefixes (timestamp, pid, host-checking marker) --- src/src/debug.c | 29 +++--- src/src/functions.h | 2 +- test/runtest | 2 +- test/stderr/0022 | 20 ++-- test/stderr/0023 | 238 ++++++++++++++++++++++---------------------- test/stderr/0537 | 128 ++++++++++++------------ test/stdout/0574 | 6 +- 7 files changed, 213 insertions(+), 212 deletions(-) diff --git a/src/src/debug.c b/src/src/debug.c index 3cd6d0c92..ee284d0be 100644 --- a/src/src/debug.c +++ b/src/src/debug.c @@ -152,33 +152,22 @@ void debug_printf_indent(const char * format, ...) { va_list ap; -unsigned depth = acl_level + expand_level, i; - -if (!debug_file) return; -if (depth > 0) - { - for (i = depth >> 2; i > 0; i--) - fprintf(debug_file, " ."); - fprintf(debug_file, "%*s", depth & 3, ""); - } - va_start(ap, format); -debug_vprintf(format, ap); +debug_vprintf(acl_level + expand_level, format, ap); va_end(ap); } - void debug_printf(const char *format, ...) { va_list ap; va_start(ap, format); -debug_vprintf(format, ap); +debug_vprintf(0, format, ap); va_end(ap); } void -debug_vprintf(const char *format, va_list ap) +debug_vprintf(int indent, const char *format, va_list ap) { int save_errno = errno; @@ -217,6 +206,18 @@ if (debug_ptr == debug_buffer) debug_prefix_length = debug_ptr - debug_buffer; } +if (indent > 0) + { + int i; + for (i = indent >> 2; i > 0; i--) + { + Ustrcpy(debug_ptr, " ."); + debug_ptr += 4; + } + Ustrncpy(debug_ptr, " ", indent & 3); + debug_ptr += indent & 3; + } + /* Use the checked formatting routine to ensure that the buffer does not overflow. Ensure there's space for a newline at the end. */ diff --git a/src/src/functions.h b/src/src/functions.h index a0ab39e17..2ff6017d8 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -135,7 +135,7 @@ extern void debug_print_ids(uschar *); extern void debug_printf_indent(const char *, ...) PRINTF_FUNCTION(1,2); extern void debug_print_string(uschar *); extern void debug_print_tree(tree_node *); -extern void debug_vprintf(const char *, va_list); +extern void debug_vprintf(int, const char *, va_list); extern void decode_bits(unsigned int *, size_t, int *, uschar *, bit_table *, int, uschar *, int); extern address_item *deliver_make_addr(uschar *, BOOL); diff --git a/test/runtest b/test/runtest index 15631dfeb..d117751c4 100755 --- a/test/runtest +++ b/test/runtest @@ -1525,7 +1525,7 @@ $munges = 'rejectlog' => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1/'}, 'debuglog_stdout' => - { 'stdout' => 's/^[ .]*\d\d:\d\d:\d\d\s+\d+ //; + { 'stdout' => 's/^\d\d:\d\d:\d\d\s+\d+ //; s/Process \d+ is ready for new message/Process pppp is ready for new message/' }, diff --git a/test/stderr/0022 b/test/stderr/0022 index 1b4622617..d83ee0e4c 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -361,11 +361,11 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> using ACL "nested_drop" >>> processing "accept" >>> check acl = drop - >>> using ACL "drop" - >>> processing "drop" - >>> message: forcibly dropped - >>> drop: condition test succeeded in ACL "drop" - >>> end of ACL "drop": DROP +>>> using ACL "drop" +>>> processing "drop" +>>> message: forcibly dropped +>>> drop: condition test succeeded in ACL "drop" +>>> end of ACL "drop": DROP >>> accept: condition test yielded "drop" in ACL "nested_drop" >>> accept: endpass encountered - denying access LOG: H=[V4NET.9.8.7] F= rejected RCPT : forcibly dropped @@ -382,11 +382,11 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> using ACL "nested_drop_require" >>> processing "require" >>> check acl = drop - >>> using ACL "drop" - >>> processing "drop" - >>> message: forcibly dropped - >>> drop: condition test succeeded in ACL "drop" - >>> end of ACL "drop": DROP +>>> using ACL "drop" +>>> processing "drop" +>>> message: forcibly dropped +>>> drop: condition test succeeded in ACL "drop" +>>> end of ACL "drop": DROP >>> require: condition test yielded "drop" in ACL "nested_drop_require" >>> end of ACL "nested_drop_require": not OK LOG: H=[V4NET.9.8.7] F= rejected RCPT : forcibly dropped diff --git a/test/stderr/0023 b/test/stderr/0023 index fa60320fe..a21b6b80f 100644 --- a/test/stderr/0023 +++ b/test/stderr/0023 @@ -451,12 +451,12 @@ LOG: H=[5.6.11.1] F= rejected RCPT : "local part of wrong type >>> host in "5.6.12.1"? yes (matched "5.6.12.1") >>> message: failed nested acl >>> check acl = acl_5_6_12A - >>> using ACL "acl_5_6_12A" - >>> processing "accept" - >>> check domains = ok +>>> using ACL "acl_5_6_12A" +>>> processing "accept" +>>> check domains = ok >>> ok in "ok"? yes (matched "ok") - >>> accept: condition test succeeded in ACL "acl_5_6_12A" - >>> end of ACL "acl_5_6_12A": ACCEPT +>>> accept: condition test succeeded in ACL "acl_5_6_12A" +>>> end of ACL "acl_5_6_12A": ACCEPT >>> accept: condition test succeeded in ACL "acl_5_6_12" >>> end of ACL "acl_5_6_12": ACCEPT >>> using ACL "acl_5_6_12" @@ -465,12 +465,12 @@ LOG: H=[5.6.11.1] F= rejected RCPT : "local part of wrong type >>> host in "5.6.12.1"? yes (matched "5.6.12.1") >>> message: failed nested acl >>> check acl = acl_5_6_12A - >>> using ACL "acl_5_6_12A" - >>> processing "accept" - >>> check domains = ok +>>> using ACL "acl_5_6_12A" +>>> processing "accept" +>>> check domains = ok >>> y in "ok"? no (end of list) - >>> accept: condition test failed in ACL "acl_5_6_12A" - >>> end of ACL "acl_5_6_12A": implicit DENY +>>> accept: condition test failed in ACL "acl_5_6_12A" +>>> end of ACL "acl_5_6_12A": implicit DENY >>> accept: condition test failed in ACL "acl_5_6_12" >>> accept: endpass encountered - denying access LOG: H=[5.6.12.1] F= rejected RCPT : failed nested acl @@ -509,86 +509,86 @@ LOG: H=[5.6.12.1] F= rejected RCPT : failed nested acl >>> using ACL "acl_8_8_8" >>> processing "accept" >>> check acl = acl_8_8_8 - >>> using ACL "acl_8_8_8" - >>> processing "accept" - >>> check acl = acl_8_8_8 - >>> using ACL "acl_8_8_8" - >>> processing "accept" - >>> check acl = acl_8_8_8 - >>> using ACL "acl_8_8_8" - >>> processing "accept" - >>> check acl = acl_8_8_8 - .>>> using ACL "acl_8_8_8" - .>>> processing "accept" - .>>> check acl = acl_8_8_8 - . >>> using ACL "acl_8_8_8" - . >>> processing "accept" - . >>> check acl = acl_8_8_8 - . >>> using ACL "acl_8_8_8" - . >>> processing "accept" - . >>> check acl = acl_8_8_8 - . >>> using ACL "acl_8_8_8" - . >>> processing "accept" - . >>> check acl = acl_8_8_8 - . .>>> using ACL "acl_8_8_8" - . .>>> processing "accept" - . .>>> check acl = acl_8_8_8 - . . >>> using ACL "acl_8_8_8" - . . >>> processing "accept" - . . >>> check acl = acl_8_8_8 - . . >>> using ACL "acl_8_8_8" - . . >>> processing "accept" - . . >>> check acl = acl_8_8_8 - . . >>> using ACL "acl_8_8_8" - . . >>> processing "accept" - . . >>> check acl = acl_8_8_8 - . . .>>> using ACL "acl_8_8_8" - . . .>>> processing "accept" - . . .>>> check acl = acl_8_8_8 - . . . >>> using ACL "acl_8_8_8" - . . . >>> processing "accept" - . . . >>> check acl = acl_8_8_8 - . . . >>> using ACL "acl_8_8_8" - . . . >>> processing "accept" - . . . >>> check acl = acl_8_8_8 - . . . >>> using ACL "acl_8_8_8" - . . . >>> processing "accept" - . . . >>> check acl = acl_8_8_8 - . . . .>>> using ACL "acl_8_8_8" - . . . .>>> processing "accept" - . . . .>>> check acl = acl_8_8_8 - . . . . >>> using ACL "acl_8_8_8" - . . . . >>> processing "accept" - . . . . >>> check acl = acl_8_8_8 - . . . . >>> using ACL "acl_8_8_8" - . . . . >>> processing "accept" - . . . . >>> check acl = acl_8_8_8 - . . . . >>> using ACL "acl_8_8_8" - . . . . >>> processing "accept" - . . . . >>> check acl = acl_8_8_8 - . . . . .>>> using ACL "acl_8_8_8" - . . . . .>>> processing "accept" - . . . . .>>> check acl = acl_8_8_8 - . . . . .>>> accept: condition test error in ACL "acl_8_8_8" - . . . . >>> accept: condition test error in ACL "acl_8_8_8" - . . . . >>> accept: condition test error in ACL "acl_8_8_8" - . . . . >>> accept: condition test error in ACL "acl_8_8_8" - . . . .>>> accept: condition test error in ACL "acl_8_8_8" - . . . >>> accept: condition test error in ACL "acl_8_8_8" - . . . >>> accept: condition test error in ACL "acl_8_8_8" - . . . >>> accept: condition test error in ACL "acl_8_8_8" - . . .>>> accept: condition test error in ACL "acl_8_8_8" - . . >>> accept: condition test error in ACL "acl_8_8_8" - . . >>> accept: condition test error in ACL "acl_8_8_8" - . . >>> accept: condition test error in ACL "acl_8_8_8" - . .>>> accept: condition test error in ACL "acl_8_8_8" - . >>> accept: condition test error in ACL "acl_8_8_8" - . >>> accept: condition test error in ACL "acl_8_8_8" - . >>> accept: condition test error in ACL "acl_8_8_8" - .>>> accept: condition test error in ACL "acl_8_8_8" - >>> accept: condition test error in ACL "acl_8_8_8" - >>> accept: condition test error in ACL "acl_8_8_8" - >>> accept: condition test error in ACL "acl_8_8_8" +>>> using ACL "acl_8_8_8" +>>> processing "accept" +>>> check acl = acl_8_8_8 +>>> using ACL "acl_8_8_8" +>>> processing "accept" +>>> check acl = acl_8_8_8 +>>> using ACL "acl_8_8_8" +>>> processing "accept" +>>> check acl = acl_8_8_8 +>>> .using ACL "acl_8_8_8" +>>> .processing "accept" +>>> .check acl = acl_8_8_8 +>>> . using ACL "acl_8_8_8" +>>> . processing "accept" +>>> . check acl = acl_8_8_8 +>>> . using ACL "acl_8_8_8" +>>> . processing "accept" +>>> . check acl = acl_8_8_8 +>>> . using ACL "acl_8_8_8" +>>> . processing "accept" +>>> . check acl = acl_8_8_8 +>>> . .using ACL "acl_8_8_8" +>>> . .processing "accept" +>>> . .check acl = acl_8_8_8 +>>> . . using ACL "acl_8_8_8" +>>> . . processing "accept" +>>> . . check acl = acl_8_8_8 +>>> . . using ACL "acl_8_8_8" +>>> . . processing "accept" +>>> . . check acl = acl_8_8_8 +>>> . . using ACL "acl_8_8_8" +>>> . . processing "accept" +>>> . . check acl = acl_8_8_8 +>>> . . .using ACL "acl_8_8_8" +>>> . . .processing "accept" +>>> . . .check acl = acl_8_8_8 +>>> . . . using ACL "acl_8_8_8" +>>> . . . processing "accept" +>>> . . . check acl = acl_8_8_8 +>>> . . . using ACL "acl_8_8_8" +>>> . . . processing "accept" +>>> . . . check acl = acl_8_8_8 +>>> . . . using ACL "acl_8_8_8" +>>> . . . processing "accept" +>>> . . . check acl = acl_8_8_8 +>>> . . . .using ACL "acl_8_8_8" +>>> . . . .processing "accept" +>>> . . . .check acl = acl_8_8_8 +>>> . . . . using ACL "acl_8_8_8" +>>> . . . . processing "accept" +>>> . . . . check acl = acl_8_8_8 +>>> . . . . using ACL "acl_8_8_8" +>>> . . . . processing "accept" +>>> . . . . check acl = acl_8_8_8 +>>> . . . . using ACL "acl_8_8_8" +>>> . . . . processing "accept" +>>> . . . . check acl = acl_8_8_8 +>>> . . . . .using ACL "acl_8_8_8" +>>> . . . . .processing "accept" +>>> . . . . .check acl = acl_8_8_8 +>>> . . . . .accept: condition test error in ACL "acl_8_8_8" +>>> . . . . accept: condition test error in ACL "acl_8_8_8" +>>> . . . . accept: condition test error in ACL "acl_8_8_8" +>>> . . . . accept: condition test error in ACL "acl_8_8_8" +>>> . . . .accept: condition test error in ACL "acl_8_8_8" +>>> . . . accept: condition test error in ACL "acl_8_8_8" +>>> . . . accept: condition test error in ACL "acl_8_8_8" +>>> . . . accept: condition test error in ACL "acl_8_8_8" +>>> . . .accept: condition test error in ACL "acl_8_8_8" +>>> . . accept: condition test error in ACL "acl_8_8_8" +>>> . . accept: condition test error in ACL "acl_8_8_8" +>>> . . accept: condition test error in ACL "acl_8_8_8" +>>> . .accept: condition test error in ACL "acl_8_8_8" +>>> . accept: condition test error in ACL "acl_8_8_8" +>>> . accept: condition test error in ACL "acl_8_8_8" +>>> . accept: condition test error in ACL "acl_8_8_8" +>>> .accept: condition test error in ACL "acl_8_8_8" +>>> accept: condition test error in ACL "acl_8_8_8" +>>> accept: condition test error in ACL "acl_8_8_8" +>>> accept: condition test error in ACL "acl_8_8_8" >>> accept: condition test error in ACL "acl_8_8_8" LOG: H=[8.8.8.8] F= temporarily rejected RCPT : ACL nested too deep: possible loop >>> host in hosts_connection_nolog? no (option unset) @@ -602,41 +602,41 @@ LOG: H=[8.8.8.8] F= temporarily rejected RCPT : ACL nested too deep: p >>> using ACL "acl_5_6_13" >>> processing "accept" >>> check acl = TESTSUITE/aux-fixed/0023.acl1 - >>> read ACL from file TESTSUITE/aux-fixed/0023.acl1 - >>> processing "accept" - >>> check domains = y +>>> read ACL from file TESTSUITE/aux-fixed/0023.acl1 +>>> processing "accept" +>>> check domains = y >>> y in "y"? yes (matched "y") - >>> check local_parts = x +>>> check local_parts = x >>> x in "x"? yes (matched "x") - >>> accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0023.acl1" - >>> end of ACL "TESTSUITE/aux-fixed/0023.acl1": ACCEPT +>>> accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0023.acl1" +>>> end of ACL "TESTSUITE/aux-fixed/0023.acl1": ACCEPT >>> accept: condition test succeeded in ACL "acl_5_6_13" >>> end of ACL "acl_5_6_13": ACCEPT >>> using ACL "acl_5_6_13" >>> processing "accept" >>> check acl = TESTSUITE/aux-fixed/0023.acl1 - >>> using ACL "TESTSUITE/aux-fixed/0023.acl1" - >>> processing "accept" - >>> check domains = y +>>> using ACL "TESTSUITE/aux-fixed/0023.acl1" +>>> processing "accept" +>>> check domains = y >>> y in "y"? yes (matched "y") - >>> check local_parts = x +>>> check local_parts = x >>> x1 in "x"? no (end of list) - >>> accept: condition test failed in ACL "TESTSUITE/aux-fixed/0023.acl1" - >>> end of ACL "TESTSUITE/aux-fixed/0023.acl1": implicit DENY +>>> accept: condition test failed in ACL "TESTSUITE/aux-fixed/0023.acl1" +>>> end of ACL "TESTSUITE/aux-fixed/0023.acl1": implicit DENY >>> accept: condition test failed in ACL "acl_5_6_13" >>> end of ACL "acl_5_6_13": implicit DENY LOG: H=[5.6.13.1] F= rejected RCPT >>> using ACL "acl_5_6_13" >>> processing "accept" >>> check acl = TESTSUITE/aux-fixed/0023.acl1 - >>> using ACL "TESTSUITE/aux-fixed/0023.acl1" - >>> processing "accept" - >>> check domains = y +>>> using ACL "TESTSUITE/aux-fixed/0023.acl1" +>>> processing "accept" +>>> check domains = y >>> y in "y"? yes (matched "y") - >>> check local_parts = x +>>> check local_parts = x >>> x2 in "x"? no (end of list) - >>> accept: condition test failed in ACL "TESTSUITE/aux-fixed/0023.acl1" - >>> end of ACL "TESTSUITE/aux-fixed/0023.acl1": implicit DENY +>>> accept: condition test failed in ACL "TESTSUITE/aux-fixed/0023.acl1" +>>> end of ACL "TESTSUITE/aux-fixed/0023.acl1": implicit DENY >>> accept: condition test failed in ACL "acl_5_6_13" >>> end of ACL "acl_5_6_13": implicit DENY LOG: H=[5.6.13.1] F= rejected RCPT @@ -1335,25 +1335,25 @@ LOG: H=[44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferr >>> using ACL "acl_60_60_60" >>> processing "accept" >>> check !acl = TESTSUITE/aux-fixed/0023.acl2 - >>> read ACL from file TESTSUITE/aux-fixed/0023.acl2 - >>> processing "accept" - >>> check domains = b +>>> read ACL from file TESTSUITE/aux-fixed/0023.acl2 +>>> processing "accept" +>>> check domains = b >>> y in "b"? no (end of list) - >>> accept: condition test failed in ACL "TESTSUITE/aux-fixed/0023.acl2" - >>> end of ACL "TESTSUITE/aux-fixed/0023.acl2": implicit DENY +>>> accept: condition test failed in ACL "TESTSUITE/aux-fixed/0023.acl2" +>>> end of ACL "TESTSUITE/aux-fixed/0023.acl2": implicit DENY >>> accept: condition test succeeded in ACL "acl_60_60_60" >>> end of ACL "acl_60_60_60": ACCEPT >>> using ACL "acl_60_60_60" >>> processing "accept" >>> check !acl = TESTSUITE/aux-fixed/0023.acl2 - >>> using ACL "TESTSUITE/aux-fixed/0023.acl2" - >>> processing "accept" - >>> check domains = b +>>> using ACL "TESTSUITE/aux-fixed/0023.acl2" +>>> processing "accept" +>>> check domains = b >>> b in "b"? yes (matched "b") - >>> check local_parts = a +>>> check local_parts = a >>> a in "a"? yes (matched "a") - >>> accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0023.acl2" - >>> end of ACL "TESTSUITE/aux-fixed/0023.acl2": ACCEPT +>>> accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0023.acl2" +>>> end of ACL "TESTSUITE/aux-fixed/0023.acl2": ACCEPT >>> accept: condition test failed in ACL "acl_60_60_60" >>> end of ACL "acl_60_60_60": implicit DENY LOG: H=[60.60.60.60] F= rejected RCPT diff --git a/test/stderr/0537 b/test/stderr/0537 index b9e20d3e8..1d927f518 100644 --- a/test/stderr/0537 +++ b/test/stderr/0537 @@ -9,38 +9,38 @@ >>> using ACL "connect" >>> processing "accept" >>> check acl = log - >>> using ACL "log" - >>> processing "accept" - >>> check logwrite = =========================================================== +>>> using ACL "log" +>>> processing "accept" +>>> check logwrite = =========================================================== LOG: =========================================================== - >>> check logwrite = sender_ip_address=[$sender_host_address] +>>> check logwrite = sender_ip_address=[$sender_host_address] >>> = sender_ip_address=[1.2.3.4] LOG: sender_ip_address=[1.2.3.4] - >>> check logwrite = sender_host_authenticated=$sender_host_authenticated +>>> check logwrite = sender_host_authenticated=$sender_host_authenticated >>> = sender_host_authenticated= LOG: sender_host_authenticated= - >>> check logwrite = authenticated_id=$authenticated_id +>>> check logwrite = authenticated_id=$authenticated_id >>> = authenticated_id= LOG: authenticated_id= - >>> check logwrite = authenticated_sender=$authenticated_sender +>>> check logwrite = authenticated_sender=$authenticated_sender >>> = authenticated_sender= LOG: authenticated_sender= - >>> check logwrite = interface_address=[$interface_address] +>>> check logwrite = interface_address=[$interface_address] >>> = interface_address=[] LOG: interface_address=[] - >>> check logwrite = received_protocol=$received_protocol +>>> check logwrite = received_protocol=$received_protocol >>> = received_protocol=smtp LOG: received_protocol=smtp >>> looking up host name for 1.2.3.4 LOG: no host name found for IP address 1.2.3.4 - >>> check logwrite = sender_host_name=$sender_host_name +>>> check logwrite = sender_host_name=$sender_host_name >>> = sender_host_name= LOG: sender_host_name= - >>> check logwrite = sender_ident=$sender_ident +>>> check logwrite = sender_ident=$sender_ident >>> = sender_ident= LOG: sender_ident= - >>> accept: condition test succeeded in ACL "log" - >>> end of ACL "log": ACCEPT +>>> accept: condition test succeeded in ACL "log" +>>> end of ACL "log": ACCEPT >>> accept: condition test succeeded in ACL "connect" >>> end of ACL "connect": ACCEPT >>> host in hosts_connection_nolog? no (option unset) @@ -54,36 +54,36 @@ LOG: sender_ident= >>> using ACL "connect" >>> processing "accept" >>> check acl = log - >>> using ACL "log" - >>> processing "accept" - >>> check logwrite = =========================================================== +>>> using ACL "log" +>>> processing "accept" +>>> check logwrite = =========================================================== LOG: =========================================================== - >>> check logwrite = sender_ip_address=[$sender_host_address] +>>> check logwrite = sender_ip_address=[$sender_host_address] >>> = sender_ip_address=[5.6.7.8] LOG: sender_ip_address=[5.6.7.8] - >>> check logwrite = sender_host_authenticated=$sender_host_authenticated +>>> check logwrite = sender_host_authenticated=$sender_host_authenticated >>> = sender_host_authenticated=authname LOG: sender_host_authenticated=authname - >>> check logwrite = authenticated_id=$authenticated_id +>>> check logwrite = authenticated_id=$authenticated_id >>> = authenticated_id=authid LOG: authenticated_id=authid - >>> check logwrite = authenticated_sender=$authenticated_sender +>>> check logwrite = authenticated_sender=$authenticated_sender >>> = authenticated_sender=authsender LOG: authenticated_sender=authsender - >>> check logwrite = interface_address=[$interface_address] +>>> check logwrite = interface_address=[$interface_address] >>> = interface_address=[9.10.11.12] LOG: interface_address=[9.10.11.12] - >>> check logwrite = received_protocol=$received_protocol +>>> check logwrite = received_protocol=$received_protocol >>> = received_protocol=smtp LOG: received_protocol=smtp - >>> check logwrite = sender_host_name=$sender_host_name +>>> check logwrite = sender_host_name=$sender_host_name >>> = sender_host_name=hostname LOG: sender_host_name=hostname - >>> check logwrite = sender_ident=$sender_ident +>>> check logwrite = sender_ident=$sender_ident >>> = sender_ident=ident LOG: sender_ident=ident - >>> accept: condition test succeeded in ACL "log" - >>> end of ACL "log": ACCEPT +>>> accept: condition test succeeded in ACL "log" +>>> end of ACL "log": ACCEPT >>> accept: condition test succeeded in ACL "connect" >>> end of ACL "connect": ACCEPT >>> host in dsn_advertise_hosts? no (option unset) @@ -92,88 +92,88 @@ LOG: sender_ident=ident >>> using ACL "mail" >>> processing "accept" >>> check acl = log - >>> using ACL "log" - >>> processing "accept" - >>> check logwrite = =========================================================== +>>> using ACL "log" +>>> processing "accept" +>>> check logwrite = =========================================================== LOG: =========================================================== - >>> check logwrite = sender_ip_address=[$sender_host_address] +>>> check logwrite = sender_ip_address=[$sender_host_address] >>> = sender_ip_address=[5.6.7.8] LOG: sender_ip_address=[5.6.7.8] - >>> check logwrite = sender_host_authenticated=$sender_host_authenticated +>>> check logwrite = sender_host_authenticated=$sender_host_authenticated >>> = sender_host_authenticated=authname LOG: sender_host_authenticated=authname - >>> check logwrite = authenticated_id=$authenticated_id +>>> check logwrite = authenticated_id=$authenticated_id >>> = authenticated_id=authid LOG: authenticated_id=authid - >>> check logwrite = authenticated_sender=$authenticated_sender +>>> check logwrite = authenticated_sender=$authenticated_sender >>> = authenticated_sender= LOG: authenticated_sender= - >>> check logwrite = interface_address=[$interface_address] +>>> check logwrite = interface_address=[$interface_address] >>> = interface_address=[9.10.11.12] LOG: interface_address=[9.10.11.12] - >>> check logwrite = received_protocol=$received_protocol +>>> check logwrite = received_protocol=$received_protocol >>> = received_protocol=esmtpa LOG: received_protocol=esmtpa - >>> check logwrite = sender_host_name=$sender_host_name +>>> check logwrite = sender_host_name=$sender_host_name >>> = sender_host_name=hostname LOG: sender_host_name=hostname - >>> check logwrite = sender_ident=$sender_ident +>>> check logwrite = sender_ident=$sender_ident >>> = sender_ident=ident LOG: sender_ident=ident - >>> accept: condition test succeeded in ACL "log" - >>> end of ACL "log": ACCEPT +>>> accept: condition test succeeded in ACL "log" +>>> end of ACL "log": ACCEPT >>> check acl = auth - >>> using ACL "auth" - >>> processing "accept" - >>> check authenticated = * +>>> using ACL "auth" +>>> processing "accept" +>>> check authenticated = * >>> authname in "*"? yes (matched "*") - >>> check logwrite = +++ host is authenticated +++ +>>> check logwrite = +++ host is authenticated +++ LOG: +++ host is authenticated +++ - >>> accept: condition test succeeded in ACL "auth" - >>> end of ACL "auth": ACCEPT +>>> accept: condition test succeeded in ACL "auth" +>>> end of ACL "auth": ACCEPT >>> accept: condition test succeeded in ACL "mail" >>> end of ACL "mail": ACCEPT >>> using ACL "mail" >>> processing "accept" >>> check acl = log - >>> using ACL "log" - >>> processing "accept" - >>> check logwrite = =========================================================== +>>> using ACL "log" +>>> processing "accept" +>>> check logwrite = =========================================================== LOG: =========================================================== - >>> check logwrite = sender_ip_address=[$sender_host_address] +>>> check logwrite = sender_ip_address=[$sender_host_address] >>> = sender_ip_address=[5.6.7.8] LOG: sender_ip_address=[5.6.7.8] - >>> check logwrite = sender_host_authenticated=$sender_host_authenticated +>>> check logwrite = sender_host_authenticated=$sender_host_authenticated >>> = sender_host_authenticated=authname LOG: sender_host_authenticated=authname - >>> check logwrite = authenticated_id=$authenticated_id +>>> check logwrite = authenticated_id=$authenticated_id >>> = authenticated_id=authid LOG: authenticated_id=authid - >>> check logwrite = authenticated_sender=$authenticated_sender +>>> check logwrite = authenticated_sender=$authenticated_sender >>> = authenticated_sender= LOG: authenticated_sender= - >>> check logwrite = interface_address=[$interface_address] +>>> check logwrite = interface_address=[$interface_address] >>> = interface_address=[9.10.11.12] LOG: interface_address=[9.10.11.12] - >>> check logwrite = received_protocol=$received_protocol +>>> check logwrite = received_protocol=$received_protocol >>> = received_protocol=esmtpa LOG: received_protocol=esmtpa - >>> check logwrite = sender_host_name=$sender_host_name +>>> check logwrite = sender_host_name=$sender_host_name >>> = sender_host_name=hostname LOG: sender_host_name=hostname - >>> check logwrite = sender_ident=$sender_ident +>>> check logwrite = sender_ident=$sender_ident >>> = sender_ident=ident LOG: sender_ident=ident - >>> accept: condition test succeeded in ACL "log" - >>> end of ACL "log": ACCEPT +>>> accept: condition test succeeded in ACL "log" +>>> end of ACL "log": ACCEPT >>> check acl = auth - >>> using ACL "auth" - >>> processing "accept" - >>> check authenticated = * +>>> using ACL "auth" +>>> processing "accept" +>>> check authenticated = * >>> authname in "*"? yes (matched "*") - >>> check logwrite = +++ host is authenticated +++ +>>> check logwrite = +++ host is authenticated +++ LOG: +++ host is authenticated +++ - >>> accept: condition test succeeded in ACL "auth" - >>> end of ACL "auth": ACCEPT +>>> accept: condition test succeeded in ACL "auth" +>>> end of ACL "auth": ACCEPT >>> accept: condition test succeeded in ACL "mail" >>> end of ACL "mail": ACCEPT diff --git a/test/stdout/0574 b/test/stdout/0574 index 3a4839d94..2c909e5d4 100644 --- a/test/stdout/0574 +++ b/test/stdout/0574 @@ -35,9 +35,9 @@ accept: condition test succeeded in ACL "chk_data" end of ACL "chk_data": ACCEPT calling local_scan(); timeout=300 local_scan() returned 0 NULL -/considering: ${tod_full} -|__expanding: ${tod_full} -\_____result: 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 -- 2.30.2