You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by bi...@apache.org on 2018/09/01 17:46:02 UTC
svn commit: r1839832 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Util.pm branches/3.4/spamd/spamd.raw
trunk/lib/Mail/SpamAssassin/Util.pm trunk/spamd/spamd.raw
Author: billcole
Date: Sat Sep 1 17:46:01 2018
New Revision: 1839832
URL: http://svn.apache.org/viewvc?rev=1839832&view=rev
Log:
remove pointless and incompatible modifier from recent patch
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
spamassassin/branches/3.4/spamd/spamd.raw
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
spamassassin/trunk/spamd/spamd.raw
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm?rev=1839832&r1=1839831&r2=1839832&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm Sat Sep 1 17:46:01 2018
@@ -643,7 +643,7 @@ sub wrap {
my $pos = 0;
my $pos_mod = 0;
while ($#arr > $pos) {
- my $len = length ($arr[$pos] =~ s/\t/ /gr);
+ my $len = length ($arr[$pos] =~ s/\t/ /g);
# if we don't want to have lines > $length (overflow==0), we
# need to verify what will happen with the next line. if we don't
@@ -651,7 +651,7 @@ sub wrap {
# line.
# we also want this to be true for the first entry on the line
if ($pos_mod != 0 && $overflow == 0) {
- $len += length ($arr[$pos+1] =~ s/\t/ /gr);
+ $len += length ($arr[$pos+1] =~ s/\t/ /g);
}
if ($len <= $length) {
Modified: spamassassin/branches/3.4/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/spamd/spamd.raw?rev=1839832&r1=1839831&r2=1839832&view=diff
==============================================================================
--- spamassassin/branches/3.4/spamd/spamd.raw (original)
+++ spamassassin/branches/3.4/spamd/spamd.raw Sat Sep 1 17:46:01 2018
@@ -2660,13 +2660,33 @@ sub handle_virtual_config_dir {
my $domain = '';
if ( $safename =~ /^(.*)\@(.*)$/ ) { $localpart = $1; $domain = $2; }
- $dir =~ s/\%u/${safename}/g;
- $dir =~ s/\%l/${localpart}/g;
- $dir =~ s/\%d/${domain}/g;
- $dir =~ s/\%\%/\%/g;
+ # Do userdir lookup exim-style.
+ # If a config for the full address exists, use that one
+ # else look for a domain default
+ if ($dir=~/%x/) {
+ ($userdir=$dir)=~s/%x/${safename}/g;
- $userdir = $dir;
- $prefsfile = $dir . '/user_prefs';
+ $prefsfile=$userdir.'/user_prefs';
+ if (-f $prefsfile) {
+ $dir = $userdir;
+
+ } else {
+ $dir =~ s/%x/${domain}/g;
+
+ $prefsfile = $dir.'/user_prefs';
+ $userdir = $dir;
+ }
+
+ # Use the normal escaping
+ } else {
+ $dir =~ s/\%u/${safename}/g;
+ $dir =~ s/\%l/${localpart}/g;
+ $dir =~ s/\%d/${domain}/g;
+ $dir =~ s/\%\%/\%/g;
+
+ $userdir = $dir;
+ $prefsfile = $dir . '/user_prefs';
+ }
# Log that the default configuration is being used for a user.
info("spamd: using default config for $username: $prefsfile");
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=1839832&r1=1839831&r2=1839832&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Sat Sep 1 17:46:01 2018
@@ -767,7 +767,7 @@ sub wrap {
my $pos = 0;
my $pos_mod = 0;
while ($#arr > $pos) {
- my $len = length ($arr[$pos] =~ s/\t/ /gr);
+ my $len = length ($arr[$pos] =~ s/\t/ /g);
# if we don't want to have lines > $length (overflow==0), we
# need to verify what will happen with the next line. if we don't
@@ -775,7 +775,7 @@ sub wrap {
# line.
# we also want this to be true for the first entry on the line
if ($pos_mod != 0 && $overflow == 0) {
- $len += length ($arr[$pos+1] =~ s/\t/ /gr);
+ $len += length ($arr[$pos+1] =~ s/\t/ /g);
}
if ($len <= $length) {
Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?rev=1839832&r1=1839831&r2=1839832&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Sat Sep 1 17:46:01 2018
@@ -2660,13 +2660,33 @@ sub handle_virtual_config_dir {
my $domain = '';
if ( $safename =~ /^(.*)\@(.*)$/ ) { $localpart = $1; $domain = $2; }
- $dir =~ s/\%u/${safename}/g;
- $dir =~ s/\%l/${localpart}/g;
- $dir =~ s/\%d/${domain}/g;
- $dir =~ s/\%\%/\%/g;
+ # Do userdir lookup exim-style.
+ # If a config for the full address exists, use that one
+ # else look for a domain default
+ if ($dir=~/%x/) {
+ ($userdir=$dir)=~s/%x/${safename}/g;
- $userdir = $dir;
- $prefsfile = $dir . '/user_prefs';
+ $prefsfile=$userdir.'/user_prefs';
+ if (-f $prefsfile) {
+ $dir = $userdir;
+
+ } else {
+ $dir =~ s/%x/${domain}/g;
+
+ $prefsfile = $dir.'/user_prefs';
+ $userdir = $dir;
+ }
+
+ # Use the normal escaping
+ } else {
+ $dir =~ s/\%u/${safename}/g;
+ $dir =~ s/\%l/${localpart}/g;
+ $dir =~ s/\%d/${domain}/g;
+ $dir =~ s/\%\%/\%/g;
+
+ $userdir = $dir;
+ $prefsfile = $dir . '/user_prefs';
+ }
# Log that the default configuration is being used for a user.
info("spamd: using default config for $username: $prefsfile");