|
Lines 1-39
Link Here
|
| 1 |
--- amavisd.orig Tue Mar 9 03:21:43 2004 |
1 |
--- amavisd.orig Fri Apr 2 21:33:50 2004 |
| 2 |
+++ amavisd Mon Mar 22 20:26:59 2004 |
2 |
+++ amavisd Sat Apr 3 12:29:41 2004 |
| 3 |
@@ -109,7 +109,7 @@ |
3 |
@@ -6461,7 +6461,7 @@ |
| 4 |
|
4 |
my($amavisd_path) = find_program_path($0, [split(/:/, $path, -1)], 0); |
| 5 |
BEGIN { |
|
|
| 6 |
fetch_modules('REQUIRED BASIC MODULES', 1, qw( |
| 7 |
- Exporter POSIX Fcntl Socket Errno Carp Carp::Heavy Time::HiRes |
| 8 |
+ Exporter POSIX Fcntl Socket Errno Carp Time::HiRes |
| 9 |
IO::File IO::Socket IO::Socket::UNIX IO::Socket::INET |
| 10 |
IO::Handle IO::Wrap IO::Stringy |
| 11 |
Digest::MD5 Unix::Syslog File::Basename File::Copy |
| 12 |
@@ -5358,7 +5358,8 @@ |
| 13 |
} |
| 14 |
section_time('parts'); prolong_timer('decoding'); |
| 15 |
} |
| 16 |
- if ($any_undecipherable) { # test if undecipherables are banned |
| 17 |
+ if ($any_undecipherable && $banned_filename_re) { |
| 18 |
+ # test if undecipherables are banned |
| 19 |
my($rn) = 'UNDECIPHERABLE'; |
| 20 |
my($result,$patt) = $banned_filename_re->lookup_re($rn); |
| 21 |
if ($result) { |
| 22 |
@@ -5920,7 +5921,7 @@ |
| 23 |
$s = $undecipherable_subject_tag; |
| 24 |
do_log(3,"adding $undecipherable_subject_tag, $any_undecipherable, $hold"); |
| 25 |
} |
| 26 |
- $s .= $sa_spam_subject_tag; |
| 27 |
+ $s .= $sa_spam_subject_tag if $do_subj; |
| 28 |
my($entity) = $msginfo->mime_entity; |
| 29 |
if (defined $entity && defined $entity->head->get('Subject',0)) { |
| 30 |
$hdr_edits->edit_header('Subject', |
| 31 |
@@ -6420,7 +6421,7 @@ |
| 32 |
local($1); |
| 33 |
$amavisd_path = $1 if $amavisd_path=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)}; # untaint |
5 |
$amavisd_path = $1 if $amavisd_path=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)}; # untaint |
| 34 |
|
6 |
|
| 35 |
-my($config_file) = '/etc/amavisd.conf'; # default location of config file |
7 |
-my($config_file) = '/etc/amavisd.conf'; # default location of config file |
| 36 |
+my($config_file) = '%%PREFIX%%/etc/amavisd.conf'; # default location of config file |
8 |
+my($config_file) = '%%PREFIX%%/etc/amavisd.conf'; # default location of config file |
| 37 |
if (@ARGV >= 2 && $ARGV[0] eq '-c') { # override by command line option -c |
9 |
if (@ARGV >= 2 && $ARGV[0] eq '-c') { # override by command line option -c |
| 38 |
shift @ARGV; $config_file = shift @ARGV; |
10 |
shift @ARGV; $config_file = shift @ARGV; |
| 39 |
local($1); |
11 |
$config_file = $1 if $config_file=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)};# untaint |