| 1 |
brianr |
1.1 |
diff -urN smeserver-mailstats-1.1.old/root/usr/bin/mailstats.pl smeserver-mailstats-1.1/root/usr/bin/mailstats.pl |
| 2 |
|
|
--- smeserver-mailstats-1.1.old/root/usr/bin/mailstats.pl 2023-02-15 08:51:39.092005908 +0000 |
| 3 |
|
|
+++ smeserver-mailstats-1.1/root/usr/bin/mailstats.pl 2023-02-15 08:54:28.360245710 +0000 |
| 4 |
|
|
@@ -32,6 +32,7 @@ |
| 5 |
|
|
# bjr - 18Dec19 - change to fix truncation of email address in by email table - bug 10327 |
| 6 |
|
|
# bjr - 18Oct20 - Alter use of lc to avoid uninitialised messages - bug 11044 |
| 7 |
|
|
# bjr - 02Apr21 - Fix up lc to try to avoif uninit messages - and alter warning status - bug 11519 |
| 8 |
|
|
+# bjr - 15Feb23 - Add in auth::auth_imap after change to use dovecot as incoming authorisation Bugzilla 12327 |
| 9 |
|
|
# |
| 10 |
|
|
############################################################################# |
| 11 |
|
|
# |
| 12 |
|
|
@@ -48,14 +49,14 @@ |
| 13 |
|
|
# / SARulePercentThreshold (0.5) - threshold of SArules percentage for report cutoff |
| 14 |
|
|
# / Email (admin) - email to send report |
| 15 |
|
|
# / SaveDataToMySQL - save data to MySQL database (default is "no") |
| 16 |
|
|
-# / ShowLeagueTotals - Show totals row after league tables - (default is "yes") |
| 17 |
|
|
+# / ShowLeagueTotals - Show totals row after league tables - (default is "yes") |
| 18 |
|
|
# / DBHost - MySQL server hostname (default is "localhost"). |
| 19 |
|
|
# / DBPort - MySQL server post (default is "3306") |
| 20 |
|
|
# / Interval - "daily", "weekly", "fortnightly", "monthly", "99999" - last is number of hours (default is daily) |
| 21 |
|
|
# / Base - "Midnight", "Midday", "Now", "99" hour (0-23) (default is midnight) |
| 22 |
|
|
-# / HTMLEmail - "yes", "no", "both" - default is "No" - Send email in HTML |
| 23 |
|
|
+# / HTMLEmail - "yes", "no", "both" - default is "No" - Send email in HTML |
| 24 |
|
|
# NOT YET INUSE - WIP! |
| 25 |
|
|
-# / HTMLPage - "yes" / "no" - default is "yes" if HTMLEmail is "yes" or "both" otherwise "no" |
| 26 |
|
|
+# / HTMLPage - "yes" / "no" - default is "yes" if HTMLEmail is "yes" or "both" otherwise "no" |
| 27 |
|
|
# |
| 28 |
|
|
############################################################################# |
| 29 |
|
|
# |
| 30 |
|
|
@@ -104,7 +105,7 @@ |
| 31 |
|
|
|
| 32 |
|
|
#Configuration section |
| 33 |
|
|
my %opt = ( |
| 34 |
|
|
- version => '0.7.15', # please update at each change. |
| 35 |
|
|
+ version => '0.7.16', # please update at each change. |
| 36 |
|
|
debug => 0, # guess what ? |
| 37 |
|
|
sendmail => '/usr/sbin/sendmail', # Path to sendmail stub |
| 38 |
|
|
from => 'spamfilter-stats', # Who is the mail from |
| 39 |
|
|
@@ -739,6 +740,8 @@ |
| 40 |
|
|
|
| 41 |
|
|
elsif ($log_items[5] eq 'auth::auth_cvm_unix_local') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc)} |
| 42 |
|
|
|
| 43 |
|
|
+ elsif ($log_items[5] eq 'auth::auth_imap') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc)} |
| 44 |
|
|
+ |
| 45 |
|
|
elsif ($log_items[5] eq 'earlytalker') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc)} |
| 46 |
|
|
|
| 47 |
|
|
elsif ($log_items[5] eq 'uribl') {$RBLcount++;$counts{$abshour}{$CATRBLDNS}++;mark_domain_rejected($proc);$blacklistURL{get_domain($log_items[7])}++} |
| 48 |
|
|
@@ -1897,5 +1900,3 @@ |
| 49 |
|
|
return unless $ip; |
| 50 |
|
|
return $ip->is_rfc1918(); |
| 51 |
|
|
} |
| 52 |
|
|
- |
| 53 |
|
|
- |
Parent Directory
| 
Revision Log
| 
Revision Graph
