2004-04-04 08:23:11 +02:00
|
|
|
--- amavisd.orig Fri Apr 2 21:33:50 2004
|
|
|
|
|
+++ amavisd Sat Apr 3 12:29:41 2004
|
|
|
|
|
@@ -6461,7 +6461,7 @@
|
|
|
|
|
my($amavisd_path) = find_program_path($0, [split(/:/, $path, -1)], 0);
|
2003-08-27 10:30:05 +02:00
|
|
|
$amavisd_path = $1 if $amavisd_path=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)}; # untaint
|
2003-04-07 03:18:06 +02:00
|
|
|
|
|
|
|
|
-my($config_file) = '/etc/amavisd.conf'; # default location of config file
|
|
|
|
|
+my($config_file) = '%%PREFIX%%/etc/amavisd.conf'; # default location of config file
|
|
|
|
|
if (@ARGV >= 2 && $ARGV[0] eq '-c') { # override by command line option -c
|
|
|
|
|
shift @ARGV; $config_file = shift @ARGV;
|
2004-04-04 08:23:11 +02:00
|
|
|
$config_file = $1 if $config_file=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)};# untaint
|
