From f6ee24a2b56b9365b948dd9e501c0e4627e6fa4f Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 8 Feb 2017 14:04:47 +0000 Subject: [PATCH] DKIM: trim debug verbosity This tidies some buildfarm fails on animals buildding without DKIM --- src/src/pdkim/pdkim.c | 2 ++ test/stderr/0021 | 4 ---- test/stderr/0022 | 12 ------------ test/stderr/0303 | 6 ------ test/stderr/0371 | 5 ----- test/stderr/0386 | 11 ----------- test/stderr/0465 | 6 ------ test/stderr/0487 | 1 - test/stderr/0575 | 4 ---- test/stderr/5410 | 9 --------- test/stderr/5420 | 9 --------- 11 files changed, 2 insertions(+), 67 deletions(-) diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c index 178f8f6a5..6e76b8e9f 100644 --- a/src/src/pdkim/pdkim.c +++ b/src/src/pdkim/pdkim.c @@ -958,11 +958,13 @@ if (ctx->flags & PDKIM_MODE_SIGN) /* DKIM-Signature: headers are added to the verification list */ else { +#ifdef notdef DEBUG(D_acl) { debug_printf("PDKIM >> raw hdr: "); pdkim_quoteprint(CUS ctx->cur_header, Ustrlen(ctx->cur_header)); } +#endif if (strncasecmp(CCS ctx->cur_header, DKIM_SIGNATURE_HEADERNAME, Ustrlen(DKIM_SIGNATURE_HEADERNAME)) == 0) diff --git a/test/stderr/0021 b/test/stderr/0021 index 4be6c99c5..7c5a79ee9 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -178,13 +178,9 @@ LOG: PANIC rcpt accepted accept: condition test succeeded in ACL "rcpt" end of ACL "rcpt": ACCEPT -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: Some{SP}message{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers added by MAIL or RCPT ACL: X-ACL-Warn: added header line >> -PDKIM >> raw hdr: quit{CR}{LF} LOG: MAIN <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss Exim version x.yz .... diff --git a/test/stderr/0022 b/test/stderr/0022 index e3269500f..bcafb8589 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -41,9 +41,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: Testing{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: search_tidyup called @@ -57,7 +54,6 @@ P Received: from [V4NET.9.8.7] (envelope-from ) id 10HmbF-0005vi-00 for warn_empty@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -PDKIM >> raw hdr: quit{CR}{LF} calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN @@ -116,9 +112,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: Testing{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: search_tidyup called @@ -132,7 +125,6 @@ P Received: from [V4NET.9.8.7] (envelope-from ) id 10HmbG-0005vi-00 for warn_log@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -PDKIM >> raw hdr: quit{CR}{LF} calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN @@ -189,9 +181,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: Testing{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: search_tidyup called @@ -208,7 +197,6 @@ P Received: from [V4NET.9.8.7] >>Headers added by MAIL or RCPT ACL: X-ACL-Warn: warn user message >> -PDKIM >> raw hdr: quit{CR}{LF} calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN diff --git a/test/stderr/0303 b/test/stderr/0303 index 8a77fd613..0a78b30f0 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -89,8 +89,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: search_tidyup called @@ -103,7 +101,6 @@ P Received: from [V4NET.2.3.4] by myhost.test.ex with esmtp (Exim x.yz) id 10HmaX-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -PDKIM >> raw hdr: quit{CR}{LF} calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN @@ -168,8 +165,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: search_tidyup called @@ -182,7 +177,6 @@ P Received: from host.name.tld ([V4NET.2.3.4]) by myhost.test.ex with esmtp (Exim x.yz) id 10HmaY-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -PDKIM >> raw hdr: quit{CR}{LF} calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN diff --git a/test/stderr/0371 b/test/stderr/0371 index 25c6cdbee..c59988723 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -74,10 +74,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} -PDKIM >> raw hdr: vrfy{SP}x@y{CR}{LF} -PDKIM >> raw hdr: mail{SP}from:{CR}{LF} >>Headers received: search_tidyup called @@ -91,7 +87,6 @@ P Received: from [V4NET.0.0.0] (helo=something) (envelope-from ) id 10HmaX-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -PDKIM >> raw hdr: quit{CR}{LF} using ACL "data" processing "accept" check set acl_m0 = $acl_m0; data diff --git a/test/stderr/0386 b/test/stderr/0386 index be777a736..44e856da2 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -191,13 +191,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: Message{SP}1{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} -PDKIM >> raw hdr: rset{CR}{LF} -PDKIM >> raw hdr: mail{SP}from:{CR}{LF} -PDKIM >> raw hdr: rcpt{SP}to:<2@b>{CR}{LF} -PDKIM >> raw hdr: data{CR}{LF} >>Headers received: search_tidyup called @@ -379,9 +372,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: Message{SP}2{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: search_tidyup called @@ -399,7 +389,6 @@ P Received: from [V4NET.11.12.13] (ident=CALLER) X-Warning: V4NET.11.12.13 is listed at rbl.test.ex X-Warning: This is a test blacklisting message >> -PDKIM >> raw hdr: quit{CR}{LF} calling local_scan(); timeout=300 local_scan() returned 0 NULL Writing spool header file: TESTSUITE/spool//input//hdr.pppp diff --git a/test/stderr/0465 b/test/stderr/0465 index 594bd002c..92250956d 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -62,8 +62,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: To:{SP}abc@domain.{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: To: abc@domain. @@ -81,7 +79,6 @@ Data file written for message 10HmaY-0005vi-00 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) id 10HmaY-0005vi-00 for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000 -PDKIM >> raw hdr: quit{CR}{LF} using ACL "check_data" processing "accept" check verify = header_syntax @@ -138,8 +135,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: To:{SP}abc@xyz.{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: To: abc@xyz. @@ -157,7 +152,6 @@ Data file written for message 10HmaX-0005vi-00 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) id 10HmaX-0005vi-00 for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000 -PDKIM >> raw hdr: quit{CR}{LF} using ACL "check_data" processing "accept" check verify = header_syntax diff --git a/test/stderr/0487 b/test/stderr/0487 index c16127b83..7319b67dd 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -41,7 +41,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: From:{SP}unqualified{CR}{LF} >>Headers received: From: unqualified diff --git a/test/stderr/0575 b/test/stderr/0575 index 37176f114..210f868ad 100644 --- a/test/stderr/0575 +++ b/test/stderr/0575 @@ -35,9 +35,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: Message.{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: search_tidyup called @@ -51,7 +48,6 @@ P Received: from [V4NET.0.0.0] (envelope-from ) id 10HmaX-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -PDKIM >> raw hdr: quit{CR}{LF} calling local_scan(); timeout=300 local_scan() returned 0 NULL LOG: MAIN diff --git a/test/stderr/5410 b/test/stderr/5410 index 04c805275..acfc011cc 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -131,8 +131,6 @@ accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA SMTP<< 354 Enter message, ending with "." on a line by itself -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 @@ -229,7 +227,6 @@ considering: for userx@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -PDKIM >> raw hdr: QUIT{CR}{LF} considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 @@ -348,8 +345,6 @@ accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA SMTP<< 354 Enter message, ending with "." on a line by itself -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 @@ -446,7 +441,6 @@ considering: for usery@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -PDKIM >> raw hdr: QUIT{CR}{LF} considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 @@ -565,8 +559,6 @@ accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA SMTP<< 354 Enter message, ending with "." on a line by itself -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 @@ -663,7 +655,6 @@ considering: for usery@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -PDKIM >> raw hdr: QUIT{CR}{LF} considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stderr/5420 b/test/stderr/5420 index a4f64f2d1..ff032e986 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -130,8 +130,6 @@ accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA SMTP<< 354 Enter message, ending with "." on a line by itself -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 @@ -228,7 +226,6 @@ considering: for userx@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -PDKIM >> raw hdr: QUIT{CR}{LF} considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 @@ -347,8 +344,6 @@ accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA SMTP<< 354 Enter message, ending with "." on a line by itself -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 @@ -445,7 +440,6 @@ considering: for usery@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -PDKIM >> raw hdr: QUIT{CR}{LF} considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 @@ -564,8 +558,6 @@ accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA SMTP<< 354 Enter message, ending with "." on a line by itself -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 @@ -662,7 +654,6 @@ considering: for usery@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -PDKIM >> raw hdr: QUIT{CR}{LF} considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 -- 2.30.2