comparison: postfix-mailgraph/postfix-mailgraph.patch
postfix-mailgraph/postfix-mailgraph.patch
- changeset 789
- cbbc8daa8174
- parent 201
- 3be96a4c8c18
equal
deleted
inserted
replaced
| 2:7fb7e5885bea | 3:0494a70263f5 |
|---|---|
| 61 + event($time, 'spam'); | 61 + event($time, 'spam'); |
| 62 + } | 62 + } |
| 63 elsif($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: /) { | 63 elsif($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: /) { |
| 64 event($time, 'rejected'); | 64 event($time, 'rejected'); |
| 65 } | 65 } |
| 66 @@ -924,6 +939,7 @@ | 66 @@ -628,7 +643,12 @@ |
| 67 } | |
| 68 } | |
| 69 elsif($prog eq 'cleanup') { | |
| 70 - if($text =~ /^[0-9A-Z]+: (?:reject|discard): /) { | |
| 71 + if($text =~ /^(?:[0-9A-Z]+: )?milter-reject: /) { | |
| 72 + if($text =~ /Intercepted/) { | |
| 73 + event($time, 'virus'); | |
| 74 + } | |
| 75 + } | |
| 76 + elsif($text =~ /^[0-9A-Z]+: (?:reject|discard): /) { | |
| 77 event($time, 'rejected'); | |
| 78 } | |
| 79 } | |
| 80 @@ -924,6 +944,7 @@ | |
| 67 --rrd-name=NAME use NAME.rrd and NAME_virus.rrd for the rrd files | 81 --rrd-name=NAME use NAME.rrd and NAME_virus.rrd for the rrd files |
| 68 --rbl-is-spam count rbl rejects as spam | 82 --rbl-is-spam count rbl rejects as spam |
| 69 --virbl-is-virus count virbl rejects as viruses | 83 --virbl-is-virus count virbl rejects as viruses |
| 70 + --multi-rule-spam count several typical reject messages as spam | 84 + --multi-rule-spam count several typical reject messages as spam |
| 71 | 85 |
