[fetchmail] Patch for multiple Return-Path

Dear all fetchmail friends,

After several times of fetchmail failed, I found that when the email header
has more then one Return-Path part, the email will become invalid and won't
be deleted from the mail server anyway.

So I think this patch is a workaround for this problem, I only read the
first
Return-Path and ignore other occurances.

Fai

--- fetchmail-6.2.2/transact.c.orig     2003-04-14 12:46:42.000000000 +0800
+++ fetchmail-6.2.2/transact.c  2003-04-14 13:04:33.000000000 +0800
@@ -381,6 +381,7 @@
     flag               headers_ok, has_nuls;
     int                        olderrs, good_addresses, bad_addresses;
     int                        retain_mail = 0;
+    flag               already_has_return_path = FALSE;
 
     sizeticker = 0;
     has_nuls = headers_ok = FALSE;
@@ -676,9 +677,15 @@
         * not trigger bounces if delivery fails.  What we *do* need to do is
         * make sure we never try to rewrite such a blank Return-Path.  We
         * handle this with a check for <> in the rewrite logic above.
+        *
+        * Also, if an email has multiple Return-Path: statement, we only
+        * read the first occurance, as some spam email has more than one
+        * Return-Path.
+        *
         */
-       if (!strncasecmp("Return-Path:", line, 12) && (cp = nxtaddr(line)))
+       if ((already_has_return_path==FALSE) && !strncasecmp("Return-Path:", 
line, 12) && (cp = nxtaddr(line)))
        {
+           already_has_return_path = TRUE;
            strncpy(msgblk.return_path, cp, sizeof(msgblk.return_path));
            msgblk.return_path[sizeof(msgblk.return_path)-1] = '\0';
            if (!ctl->mda) {