Don't reformat Return-Path (angle brackets are not optional). Closes #1702.

diff --git a/ChangeLog b/ChangeLog
index bf61774d6d19899c7ed51bf8a728d1b8f86811bc..06cba4bc507d3cc694d8ff9cd8e96b6c21a7624c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-06-10 17:44 +0200  Rocco Rutte  <pdmef@gmx.net>  (0721c3f6320d)
+
+       * mbox.c, mx.c: Only print messages about CONTEXT when quiet flag not
+       set
+
+2009-06-09 22:09 -0700  Brendan Cully  <brendan@kublai.com>  (dc9ec900c657)
+
+       * ChangeLog, mutt_ssl.c: Improve host checking for SSL with
+       intermediate certificates.
+
 2009-06-09 22:03 -0700  Brendan Cully  <brendan@kublai.com>  (9dcb7288039d)
 
        * mutt_ssl.c: Whitespace.

diff --git a/copy.c b/copy.c
index 95e12aed7d8906def1035dc614db3fb7059d9e4c..90a65dad9762d96f522144c102ec7621c9828128 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -865,7 +865,7 @@ static void format_address_header (char **h, ADDRESS *a)
 static int address_header_decode (char **h)
 {
   char *s = *h;
-  int l;
+  int l, rp = 0;
 
   ADDRESS *a = NULL;
 
@@ -876,6 +876,7 @@ static int address_header_decode (char **h)
       if (ascii_strncasecmp (s, "return-path:", 12) == 0)
       {
        l = 12;
+       rp = 1;
        break;
       }
       else if (ascii_strncasecmp (s, "reply-to:", 9) == 0)
@@ -936,15 +937,20 @@ static int address_header_decode (char **h)
   
   mutt_addrlist_to_local (a);
   rfc2047_decode_adrlist (a);
-  
-  *h = safe_calloc (1, l + 2);
-  
-  strfcpy (*h, s, l + 1);
-  
-  format_address_header (h, a);
+
+  /* angle brackets for return path are mandated by RfC5322,
+   * so leave Return-Path as-is */
+  if (rp)
+    *h = safe_strdup (s);
+  else
+  {
+    *h = safe_calloc (1, l + 2);
+    strfcpy (*h, s, l + 1);
+    format_address_header (h, a);
+  }
 
   rfc822_free_address (&a);
-  
+
   FREE (&s);
   return 1;
 }