8af2c6efd8
- Fix RUN_DEPENDS to properly include unzip dependency when needed [1] - Fix "--block-password-protected" bug [3] - Add QMAILSCAN_NOTUNZIP knob (requested by David Sieborger) - Change default for QMAILSCAN_NOTIFY to 'psender, precips' - Add QMAILSCAN_LANG knob to select language [2] PR: ports/71376 [1], ports/68770 [2] Submitted by: freebsd@simplerezo.com (maintainer) [1], Renato Botelho <renato@galle.com.br> [2] Obtained from: David Sieborger [3]
51 lines
1.6 KiB
Text
51 lines
1.6 KiB
Text
--- qmail-scanner-queue.template.orig Wed Mar 10 21:02:05 2004
|
|
+++ qmail-scanner-queue.template Mon Mar 15 01:26:52 2004
|
|
@@ -85,11 +85,17 @@
|
|
|
|
|
|
#From: line information used when making reports
|
|
-my $V_FROM='USERNAME@MAILDOMAIN';
|
|
-my $V_FROMNAME='System Anti-Virus Administrator';
|
|
+my $V_FROM='ADMIN_MAIL';
|
|
+my $V_FROMNAME='ADMIN_REALNAME';
|
|
|
|
# Address carbon-copied on any virus reports
|
|
-my $QUARANTINE_CC='USERNAME@MAILDOMAIN';
|
|
+my $QUARANTINE_CC='ADMIN_MAIL';
|
|
+
|
|
+# Address to where spams are redirected
|
|
+my $SPAMSADMIN='SPAMS_REDIRECT';
|
|
+
|
|
+# Suffix to alter recipients with (when spam detected)
|
|
+my $SPAMSSUFFIX='SPAMS_TOSUFFIX';
|
|
|
|
#Array of local domains that are checked against for
|
|
#deciding whether or not to send recipient alerts to
|
|
@@ -302,6 +308,7 @@
|
|
}
|
|
|
|
my ($quarantine_event,$quarantine_event_tmp,$quarantine_DOS)=0;
|
|
+my $spam_event=0;
|
|
|
|
my $file_id = &uniq_id();
|
|
|
|
@@ -424,7 +431,18 @@
|
|
&email_quarantine_report;
|
|
} else {
|
|
&qmail_parent_check;
|
|
- &qmail_requeue($env_returnpath,$env_recips,"$scandir/$wmaildir/new/$file_id");
|
|
+ if ($spam_event) {
|
|
+ if ($SPAMSADMIN) {
|
|
+ &qmail_requeue($env_returnpath,"T$SPAMSADMIN\0\0","$scandir/$wmaildir/new/$file_id");
|
|
+ } elsif ($SPAMSSUFFIX) {
|
|
+ $env_recips =~ s/\@/\-$SPAMSSUFFIX\@/g;
|
|
+ &qmail_requeue($env_returnpath,$env_recips,"$scandir/$wmaildir/new/$file_id");
|
|
+ } else {
|
|
+ &qmail_requeue($env_returnpath,$env_recips,"$scandir/$wmaildir/new/$file_id");
|
|
+ }
|
|
+ } else {
|
|
+ &qmail_requeue($env_returnpath,$env_recips,"$scandir/$wmaildir/new/$file_id");
|
|
+ }
|
|
}
|
|
alarm 0;
|
|
};
|