X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fpflogsumm.git;a=blobdiff_plain;f=pflogsumm.pl;h=d584327dccd54a73a707b6f57605d00bff1032ad;hp=465fbcbcc82627a3d3105837ed866c8857b3d27f;hb=635b2d2fdf790e110d11922ea6d83c60e7584dcd;hpb=5c993ae14f7a7f5b20734081cb078284c45a114a

diff --git a/pflogsumm.pl b/pflogsumm.pl
index 465fbcb..d584327 100755
--- 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;