Don't allow setting Return-Path: header via my_hdr

Mutt has use_envelope_from/envelope_from_address for that purpose.
Closes #1840.

diff --git a/ChangeLog b/ChangeLog
index 06cba4bc507d3cc694d8ff9cd8e96b6c21a7624c..4453038d68403c3d0c426618e074f9973ee595e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-06-11 18:17 +0200  Rocco Rutte  <pdmef@gmx.net>  (8efc1cd0b8c0)
+
+       * browser.c: Use only latest mtime of new/cur for browser, not whole
+       stat() info
+
+2009-06-11 18:14 +0200  Rocco Rutte  <pdmef@gmx.net>  (05f8c53b57a1)
+
+       * ChangeLog, copy.c: Don't reformat Return-Path (angle brackets are
+       not optional). Closes #1702.
+
 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

diff --git a/send.c b/send.c
index d42818c1fef6ee5593a8aba4b4367f62bf04d5e2..96b2d5e4dc102dd2c4b4d7fb09cce43fa5f46cf7 100644 (file)
--- a/send.c
+++ b/send.c
@@ -309,7 +309,8 @@ static void process_user_header (ENVELOPE *env)
     else if (ascii_strncasecmp ("to:", uh->data, 3) != 0 &&
             ascii_strncasecmp ("cc:", uh->data, 3) != 0 &&
             ascii_strncasecmp ("bcc:", uh->data, 4) != 0 &&
-            ascii_strncasecmp ("subject:", uh->data, 8) != 0)
+            ascii_strncasecmp ("subject:", uh->data, 8) != 0 &&
+            ascii_strncasecmp ("return-path:", uh->data, 12) != 0)
     {
       if (last)
       {