b346e4618c
This release adds checking of a number of archive members to improve protection from runaway dearchivers. It fixes SQL quarantining of mail with a null sender, and recognizes PostgreSQL error S8006. Parsing of invalid header has been improved. Calling 'finish' on a SA message object was added. A nonstandard SMTP status code 254 is no longer used, and enforcing of option 8BITMIME is avoid even on 8-bit contents. Checking of eval status was improved to recognize additional failure modes. Disabling of MIME decoding and invoking of a file(1) utility has been made possible. An AV entry for ArcaVir was added.
33 lines
1.7 KiB
Text
33 lines
1.7 KiB
Text
$NetBSD: patch-aa,v 1.5 2007/06/01 04:41:07 xtraeme Exp $
|
|
|
|
--- amavisd.conf.orig 2007-06-01 06:33:09.000000000 +0200
|
|
+++ amavisd.conf 2007-06-01 06:36:24.000000000 +0200
|
|
@@ -15,15 +15,15 @@
|
|
# $bypass_decode_parts = 1; # controls running of decoders&dearchivers
|
|
|
|
$max_servers = 2; # num of pre-forked children (2..15 is common), -m
|
|
-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
|
|
-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
|
|
+$daemon_user = '@AMAVIS_USER@'; # (no default; customary: vscan or amavis), -u
|
|
+$daemon_group = '@AMAVIS_GROUP@'; # (no default; customary: vscan or amavis), -g
|
|
|
|
$mydomain = 'example.com'; # a convenient default for other settings
|
|
|
|
-# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H
|
|
+$MYHOME = '@AMAVIS_DIR@'; # a convenient default for other settings, -H
|
|
$TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T
|
|
$ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc.
|
|
-$QUARANTINEDIR = '/var/virusmails'; # -Q
|
|
+$QUARANTINEDIR = '@AMAVIS_QUARANTINE@'; # -Q
|
|
# $quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine
|
|
|
|
# $daemon_chroot_dir = $MYHOME; # chroot directory or undef, -R
|
|
@@ -124,7 +124,7 @@
|
|
# $recipient_delimiter = '+'; # undef disables address extensions altogether
|
|
# when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+
|
|
|
|
-$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
|
|
+$path = '@PREFIX@/sbin:@PREFIX@/bin:@LOCALBASE@/sbin:@LOCALBASE@/bin:/usr/sbin:/sbin:/usr/bin:/bin';
|
|
# $dspam = 'dspam';
|
|
|
|
$MAXLEVELS = 14;
|