smeserver-mailstats/contribs7/smeserver-mailstats-0.0.3-fix-tls-stats.patch

diff -up smeserver-mailstats-0.0.3/root/usr/bin/spamfilter-stats-7.pl.update-stats-0_6_23 smeserver-mailstats-0.0.3/root/usr/bin/spamfilter-stats-7.pl
--- smeserver-mailstats-0.0.3/root/usr/bin/spamfilter-stats-7.pl.update-stats-0_6_23    2010-01-11 19:04:56.000000000 +0100
+++ smeserver-mailstats-0.0.3/root/usr/bin/spamfilter-stats-7.pl        2010-01-11 19:08:51.000000000 +0100
@@ -2,12 +2,11 @@
 
 #############################################################################
 #
-# This script provides daily SpamFilter statistics and deletes all users
-# junkmails. Configuration of the script is done by the Spam Filter
-# Server-Manager module
+# This script provides daily SpamFilter statistics.
 #
-# This script has originally been developed
-# by Jesper Knudsen at http://sme.swerts-knudsen.dk
+# This script was originally developed
+# by Jesper Knudsen at http://sme.swerts-knudsen.dk 
+# and re-written by brian read at bjsystems.co.uk (with some help from the community - thanks guys)
 #
 #############################################################################
 #
@@ -60,7 +59,7 @@ if ($cdb->get('mailstats')){
 
 #Configuration section
 my %opt = (
-    version => '0.6.22',                        # please update at each change.
+    version => '0.6.23',                        # please update at each change.
     debug => 0,                                 # guess what ?
     sendmail => '/usr/sbin/sendmail',           # Path to sendmail stub
     from => 'spamfilter-stats',                 # Who is the mail from
@@ -477,8 +476,13 @@ LINE: while (<>) {
             }
             next LINE
    }
+   
 
-   print $log_items[5]."\n";  #Not detected
+   if ($log_items[5] eq 'tls') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
+ 
+
+   print "Unexpected failure string in log file: ".$log_items[5]."\n";  #Not detected
+   next LINE
 
    }
 
1	snetram	1.1	diff -up smeserver-mailstats-0.0.3/root/usr/bin/spamfilter-stats-7.pl.update-stats-0_6_23 smeserver-mailstats-0.0.3/root/usr/bin/spamfilter-stats-7.pl
2			--- smeserver-mailstats-0.0.3/root/usr/bin/spamfilter-stats-7.pl.update-stats-0_6_23 2010-01-11 19:04:56.000000000 +0100
3			+++ smeserver-mailstats-0.0.3/root/usr/bin/spamfilter-stats-7.pl 2010-01-11 19:08:51.000000000 +0100
4			@@ -2,12 +2,11 @@
5
6			#############################################################################
7			#
8			-# This script provides daily SpamFilter statistics and deletes all users
9			-# junkmails. Configuration of the script is done by the Spam Filter
10			-# Server-Manager module
11			+# This script provides daily SpamFilter statistics.
12			#
13			-# This script has originally been developed
14			-# by Jesper Knudsen at http://sme.swerts-knudsen.dk
15			+# This script was originally developed
16			+# by Jesper Knudsen at http://sme.swerts-knudsen.dk
17			+# and re-written by brian read at bjsystems.co.uk (with some help from the community - thanks guys)
18			#
19			#############################################################################
20			#
21			@@ -60,7 +59,7 @@ if ($cdb->get('mailstats')){
22
23			#Configuration section
24			my %opt = (
25			- version => '0.6.22', # please update at each change.
26			+ version => '0.6.23', # please update at each change.
27			debug => 0, # guess what ?
28			sendmail => '/usr/sbin/sendmail', # Path to sendmail stub
29			from => 'spamfilter-stats', # Who is the mail from
30			@@ -477,8 +476,13 @@ LINE: while (<>) {
31			}
32			next LINE
33			}
34			+
35
36			- print $log_items[5]."\n"; #Not detected
37			+ if ($log_items[5] eq 'tls') {$MiscDenyCount++;$counts{$abshour}{$CATNONCONF}++;mark_domain_rejected($proc);next LINE}
38			+
39			+
40			+ print "Unexpected failure string in log file: ".$log_items[5]."\n"; #Not detected
41			+ next LINE
42
43			}
44