40 lines
2.0 KiB
Plaintext
40 lines
2.0 KiB
Plaintext
$OpenBSD: patch-amavisd_conf,v 1.7 2012/07/07 19:09:36 giovanni Exp $
|
|
--- amavisd.conf.orig Sat Jun 30 23:33:32 2012
|
|
+++ amavisd.conf Tue Jul 3 18:12:15 2012
|
|
@@ -14,12 +14,12 @@ use strict;
|
|
# $bypass_decode_parts = 1; # controls running of decoders&dearchivers
|
|
|
|
$max_servers = 2; # num of pre-forked children (2..30 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 = '_vscan'; # (no default; customary: _vscan or amavis), -u
|
|
+$daemon_group = '_vscan'; # (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 = '/var/amavisd'; # 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
|
|
@@ -313,7 +313,7 @@ $banned_filename_re = new_RE(
|
|
@decoders = (
|
|
['mail', \&do_mime_decode],
|
|
# [[qw(asc uue hqx ync)], \&do_ascii], # not safe
|
|
- ['F', \&do_uncompress, ['unfreeze', 'freeze -d', 'melt', 'fcat'] ],
|
|
+# ['F', \&do_uncompress, ['unfreeze', 'freeze -d', 'melt', 'fcat'] ],
|
|
['Z', \&do_uncompress, ['uncompress', 'gzip -d', 'zcat'] ],
|
|
['gz', \&do_uncompress, 'gzip -d'],
|
|
['gz', \&do_gunzip],
|
|
@@ -331,8 +331,8 @@ $banned_filename_re = new_RE(
|
|
# ['/usr/local/heirloom/usr/5bin/pax', 'pax', 'gcpio', 'cpio']
|
|
['deb', \&do_ar, 'ar'],
|
|
# ['a', \&do_ar, 'ar'], # unpacking .a seems an overkill
|
|
- ['rar', \&do_unrar, ['unrar', 'rar'] ],
|
|
- ['arj', \&do_unarj, ['unarj', 'arj'] ],
|
|
+ ['rar', \&do_7zip, ['7z'] ],
|
|
+ ['arj', \&do_7zip, ['7z'] ],
|
|
['arc', \&do_arc, ['nomarch', 'arc'] ],
|
|
['zoo', \&do_zoo, ['zoo', 'unzoo'] ],
|
|
['doc', \&do_ole, 'ripole'],
|