[svn-inject] Applying Debian modifications to trunk

[sven/pflogsumm.git] / pflogsumm.pl

diff --git a/pflogsumm.pl b/pflogsumm.pl
index 465fbcbcc82627a3d3105837ed866c8857b3d27f..d584327dccd54a73a707b6f57605d00bff1032ad 100755 (executable)
--- a/pflogsumm.pl
+++ b/pflogsumm.pl
@@ -696,7 +696,7 @@ while(<>) {
            }
        }
        elsif((($addr, $relay, $delay, $status, $toRmdr) = $logRmdr =~
-               /to=<([^>]*)>, (?:orig_to=<[^>]*>, )?relay=([^,]+), delay=([^,]+), status=(\S+)(.*)$/o) >= 4)
+               /to=<([^>]*)>, (?:orig_to=<[^>]*>, )?relay=([^,]+), delay=([^,]+), (?:delays=[^,]+, )?(?:dsn=\d+\.\d+\.\d+, )?status=(\S+)(.*)$/o) >= 4)
        {
 
            if($opts{'m'} && $addr =~ /^(.*!)*([^!]+)!([^!@]+)@([^\.]+)$/o) {
@@ -1449,6 +1449,9 @@ sub adj_time_units {
 sub said_string_trimmer {
     my($trimmedString, $maxLen) = @_;
 
+    # If theres a "deferred ()" in the logfile.
+    if (not defined $trimmedString) { return "" };
+
     while(length($trimmedString) > $maxLen) {
        if($trimmedString =~ /^.* said: /o) {
            $trimmedString =~ s/^.* said: //o;