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/07/30 17:15:34 UTC

svn commit: r1864014 - in /spamassassin: branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm

Author: hege
Date: Tue Jul 30 17:15:34 2019
New Revision: 1864014

URL: http://svn.apache.org/viewvc?rev=1864014&view=rev
Log:
Bug 7383 - auto_whitelist_path from config not used

Modified:
    spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm?rev=1864014&r1=1864013&r2=1864014&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm Tue Jul 30 17:15:34 2019
@@ -940,8 +940,7 @@ across all users.
     code         => sub {
         my ($self, $key, $value, $line) = @_;
         unless (defined $value && $value !~ /^$/) {return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;}
-        if (-d $value)                            {return $Mail::SpamAssassin::Conf::INVALID_VALUE; }
-        $self->{txrep_path} = $value;
+        $self->{auto_whitelist_path} = $value;
     }
   });
 
@@ -994,7 +993,7 @@ not have any execute bits set (the umask
         if ($value !~ /^0?[0-7]{3}$/) {
             return $Mail::SpamAssassin::Conf::INVALID_VALUE;
         }
-        $self->{txrep_file_mode} = untaint_var($value);
+        $self->{auto_whitelist_file_mode} = untaint_var($value);
     }
   });
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm?rev=1864014&r1=1864013&r2=1864014&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm Tue Jul 30 17:15:34 2019
@@ -940,8 +940,7 @@ across all users.
     code         => sub {
         my ($self, $key, $value, $line) = @_;
         unless (defined $value && $value !~ /^$/) {return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;}
-        if (-d $value)                            {return $Mail::SpamAssassin::Conf::INVALID_VALUE; }
-        $self->{txrep_path} = $value;
+        $self->{auto_whitelist_path} = $value;
     }
   });
 
@@ -994,7 +993,7 @@ not have any execute bits set (the umask
         if ($value !~ /^0?[0-7]{3}$/) {
             return $Mail::SpamAssassin::Conf::INVALID_VALUE;
         }
-        $self->{txrep_file_mode} = untaint_var($value);
+        $self->{auto_whitelist_file_mode} = untaint_var($value);
     }
   });