Enhanced bounce detection.
authorwerner <werner>
Mon, 18 Jul 2005 06:07:46 +0000 (06:07 +0000)
committerwerner <werner>
Mon, 18 Jul 2005 06:07:46 +0000 (06:07 +0000)
ChangeLog
scrutmime.c

index 3fd3c0e..fa9e399 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-18  Werner Koch  <wk@g10code.com>
+
+       * scrutmime.c (parse_message): Cope with aditional Exim generated
+       info lines.
+
 2005-07-13  Werner Koch  <wk@g10code.com>
 
        * scrutmime.c (parse_message): Add a kludge to allow parsing
index ded63df..1df0c21 100644 (file)
@@ -417,8 +417,18 @@ parse_message (FILE *fp)
 
       if (skip_leading_empty_lines)
         {
+          if (skip_leading_empty_lines == 1)
+            {
+              /* Sometimes additional information follows the
+                 indication line indicated by 6 dashes.  Skip them
+                 before detecting empty lines. */
+              if (length && !strncmp (line , "------ ", 7))
+                continue;
+              skip_leading_empty_lines++;
+            }
           if (!length)
             continue;
+
           skip_leading_empty_lines = 0;
         }