]>
Commit | Line | Data |
---|---|---|
4ca545d6 AA |
1 | diff -Nur old/AMAVIS.pm new/AMAVIS.pm |
2 | --- old/AMAVIS.pm 2003-04-14 15:18:21.000000000 +0000 | |
3 | +++ new/AMAVIS.pm 2004-07-14 00:00:49.000000000 +0000 | |
4 | @@ -88,6 +88,7 @@ | |
5 | $cfg_chroot | |
6 | ||
7 | $cfg_unpack_dir | |
8 | + $cfg_do_quarantine | |
9 | $cfg_quarantine_dir | |
10 | $cfg_problem_dir | |
11 | ||
12 | @@ -174,6 +175,7 @@ | |
13 | ': no unpack dir specified, using /tmp'); | |
14 | } | |
15 | # Quarantine path for rejected messages | |
16 | + $cfg_do_quarantine = (lc($cfg->val('paths', 'do quarantine')) || 'yes'); | |
17 | $cfg_quarantine_dir = ($cfg->val('paths', 'quarantine') || | |
18 | $cfg->val('paths', 'quarantine dir') || | |
19 | '/var/spool/amavis-ng/quarantine'); | |
20 | @@ -502,7 +504,7 @@ | |
21 | $mta->drop_message($args); | |
22 | ||
23 | # Quarantine message | |
24 | - if (defined $cfg_quarantine_dir) { | |
25 | + if ($cfg_do_quarantine eq 'yes' && defined $cfg_quarantine_dir) { | |
26 | $self->quarantine_message($args, $cfg_quarantine_dir) or do { | |
27 | writelog($args,LOG_CRIT, __PACKAGE__. | |
28 | ": Error while quarantining message"); | |
29 | diff -Nur old/etc/amavis.conf new/etc/amavis.conf | |
30 | --- old/etc/amavis.conf 2003-04-08 14:09:56.000000000 +0000 | |
31 | +++ new/etc/amavis.conf 2004-07-14 00:03:07.000000000 +0000 | |
32 | @@ -82,7 +82,7 @@ | |
33 | ||
34 | ;; Where should infected mail be stored? (Only the actual mail, not | |
35 | ;; the unpacked attachments) | |
36 | - | |
37 | +do quarantine = yes | |
38 | ; quarantine dir = /var/spool/amavis-ng/quarantine | |
39 | ||
40 | ;; If problems occur, put message into this directory |