Attachment 933503 Details for Bug 1133356 – patch to show postscreen-rejects and clamav-milter

patch to show postscreen-rejects and clamav-milter

mailgraph.diff (text/plain), 2.53 KB, created by Harald Reindl on 2014-09-01 18:54:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Reindl

Created: 2014-09-01 18:54:26 UTC

Size: 2.53 KB

patch

obsolete

>--- mailgraph-original	2014-09-01 20:50:48.737862549 +0200
>+++ mailgraph-patched	2014-09-01 20:34:06.739766238 +0200
>@@ -85,7 +85,7 @@
>     # - compensate if yes
>     # note that we assume that the DST-switch goes like this:
>     # time   1:00  1:30  2:00  2:30  2:00  2:30  3:00  3:30
>-    # stamp   1     2     3     4     3     3     7     8  
>+    # stamp   1     2     3     4     3     3     7     8
>     # comp.   0     0     0     0     2     2     0     0
>     # result  1     2     3     4     5     6     7     8
>     # old Time::Local versions behave differently (1 2  5 6 5 6 7 8)
>@@ -202,7 +202,7 @@
>     }
>     my $file = $self->{file};
>     line: while(defined (my $str = $self->_next_line)) {
>-        # date, time and host 
>+        # date, time and host
>         $str =~ /^
>             (\S{3})\s+(\d+)      # date  -- 1, 2
>             \s
>@@ -264,11 +264,11 @@
>         };
>         if($self->{arrayref}) {
>             $self->{_last_data}{$host} = [
>-                $time,  # 0: timestamp 
>-                $host,  # 1: host      
>-                $1,     # 2: program   
>-                $2,     # 3: pid       
>-                $6,     # 4: text      
>+                $time,  # 0: timestamp
>+                $host,  # 1: host
>+                $1,     # 2: program
>+                $2,     # 3: pid
>+                $6,     # 4: text
>                 ];
>         }
>         else {
>@@ -292,7 +292,7 @@
>     my ($self) = @_;
>     my $file = $self->{file};
>     line: while(my $str = $self->_next_line) {
>-	# date, time and host 
>+	# date, time and host
> 	$str =~ /^
>             (\S{3})\s+(\d+)   # date  -- 1, 2
>             \s
>@@ -323,9 +323,9 @@
>         };
>         if($self->{arrayref}) {
>             return [
>-                $time,  # 0: timestamp 
>-                'localhost',  # 1: host      
>-                $1,     # 2: program   
>+                $time,  # 0: timestamp
>+                'localhost',  # 1: host
>+                $1,     # 2: program
>                 undef,  # 3: (no) pid
>                 $2,     # 4: text
>                 ];
>@@ -595,8 +595,18 @@
> 				event($time, 'bounced');
> 			}
> 		}
>+		elsif($prog eq 'postscreen') {
>+		 if($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: /) {
>+    event($time, 'rejected');
>+   }
>+		}
>+  elsif($prog eq 'cleanup') {
>+   if($text =~ /Virus found/) {
>+    event($time, 'virus');
>+   }
>+  }
> 		elsif($prog eq 'smtpd') {
>-			if($text =~ /^[0-9A-Z]+: client=(\S+)/) {
>+			if($text =~ /client=(\S+)/) {
> 				my $client = $1;
> 				return if $opt{'ignore-localhost'} and
> 					$client =~ /\[127\.0\.0\.1\]$/;

Actions: View

Attachments on bug 1133356: 933503 | 937497