You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/08/31 08:47:27 UTC
svn commit: r1866194 - in /spamassassin/trunk:
lib/Mail/SpamAssassin/Plugin/DCC.pm rules/25_dcc.cf
Author: hege
Date: Sat Aug 31 08:47:27 2019
New Revision: 1866194
URL: http://svn.apache.org/viewvc?rev=1866194&view=rev
Log:
Clarify DCC 2.x free status, add raw logging
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
spamassassin/trunk/rules/25_dcc.cf
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm?rev=1866194&r1=1866193&r2=1866194&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm Sat Aug 31 08:47:27 2019
@@ -150,9 +150,8 @@ Whether to use DCC, if it is available.
=item use_dcc_rep (0|1) (default: 1)
Whether to use the commercial DCC Reputation feature, if it is available.
-Default is 1 for backwards compatibility. If you don't have commercial
-license, you can disable this to ignore check_dcc_reputation_range rules and
-save a few CPU cycles.
+Note that reputation data is free for all starting from DCC 2.x version,
+where it's automatically used.
=cut
@@ -176,15 +175,16 @@ The default is C<999999> for all these o
=item dcc_rep_percent NUMBER
-Only the commercial DCC software provides DCC Reputations. A DCC Reputation
-is the percentage of bulk mail received from the last untrusted relay in the
-path taken by a mail message as measured by all commercial DCC installations.
-See http://www.rhyolite.com/dcc/reputations.html
-You C<must> whitelist your trusted relays or MX servers with MX or
-MXDCC lines in /var/dcc/whiteclnt as described in the main DCC man page
-to avoid seeing your own MX servers as sources of bulk mail.
-See https://www.dcc-servers.net/dcc/dcc-tree/dcc.html#White-and-Blacklists
-The default is C<90>.
+Only the commercial DCC software provides DCC Reputations (but starting from
+DCC 2.x version it is available for all). A DCC Reputation is the
+percentage of bulk mail received from the last untrusted relay in the path
+taken by a mail message as measured by all commercial DCC installations.
+See http://www.rhyolite.com/dcc/reputations.html You C<must> whitelist your
+trusted relays or MX servers with MX or MXDCC lines in /var/dcc/whiteclnt as
+described in the main DCC man page to avoid seeing your own MX servers as
+sources of bulk mail. See
+https://www.dcc-servers.net/dcc/dcc-tree/dcc.html#White-and-Blacklists The
+default is C<90>.
=cut
@@ -703,10 +703,11 @@ sub _check_async {
} else {
shift @resp; shift @resp; # ignore status/multistatus line
if (@resp) {
+ dbg("dcc: dccifd raw response: ".join("", @resp));
($pms->{dcc_x_result}, $pms->{dcc_cksums}) =
$self->parse_dcc_response(\@resp, 'dccifd');
if ($pms->{dcc_x_result}) {
- dbg("dcc: dccifd responded with '$pms->{dcc_x_result}'");
+ dbg("dcc: dccifd parsed response: $pms->{dcc_x_result}");
$pms->{dcc_result} = $self->check_dcc_result($pms, $pms->{dcc_x_result});
if ($pms->{dcc_result}) {
$pms->got_hit($pms->{dcc_rulename}, "", ruletype => 'eval');
Modified: spamassassin/trunk/rules/25_dcc.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_dcc.cf?rev=1866194&r1=1866193&r2=1866194&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_dcc.cf (original)
+++ spamassassin/trunk/rules/25_dcc.cf Sat Aug 31 08:47:27 2019
@@ -39,6 +39,8 @@ reuse DCC_CHECK
# to receive reputation data from DCC servers requires a commercial license
+# Update 2019: reputation data is free starting from DCC 2.x version
+
full DCC_REPUT_00_12 eval:check_dcc_reputation_range(00,12)
describe DCC_REPUT_00_12 DCC reputation between 0 and 12 % (mostly ham)
tflags DCC_REPUT_00_12 nice net noautolearn