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
13 ': no unpack dir specified, using /tmp');
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');
21 $mta->drop_message($args);
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
34 ;; Where should infected mail be stored? (Only the actual mail, not
35 ;; the unpacked attachments)
38 ; quarantine dir = /var/spool/amavis-ng/quarantine
40 ;; If problems occur, put message into this directory