X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fspost.c;h=e2b43bd6350b4d68db03e335c9f9417539e3e7f8;hp=555bb68dceee6ca4cf30403e786eaf1bcdb1d3f9;hb=9a33ff618b5901a3af815650d4b84d39ee96e529;hpb=877d0da4a8334e53ebc0a8b740efe489e0817e92

diff --git a/uip/spost.c b/uip/spost.c
index 555bb68..e2b43bd 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -6,6 +6,10 @@
  * when "sendmail" is the transport system.
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
@@ -14,7 +18,8 @@
 #include <h/aliasbr.h>
 #include <h/dropsbr.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>
+#include <h/utils.h>
 
 #define	uptolow(c)	((isalpha(c) && isupper (c)) ? tolower (c) : c)
 
@@ -177,6 +182,8 @@ extern char *sendmail;
 extern char *getfullname (void);
 extern char *getusername (void);
 
+extern boolean  draft_from_masquerading;  /* defined in mts.c */
+
 /*
  * static prototypes
  */
@@ -574,10 +581,19 @@ finish_headers (FILE *out)
 	case normal: 
 	    if (!(msgflags & MDAT))
 		fprintf (out, "Date: %s\n", dtimenow (0));
-	    if (msgflags & MFRM)
-		fprintf (out, "Sender: %s\n", from);
+	    
+	    if (msgflags & MFRM) {
+		/* There was already a From: in the draft.  Don't add one. */
+		if (!draft_from_masquerading)
+		    /* mts.conf didn't contain "masquerade:[...]draft_from[...]"
+		       so we'll reveal the user's actual account@thismachine
+		       address in a Sender: header (and use it as the envelope
+		       From: later). */
+		    fprintf (out, "Sender: %s\n", from);
+	    }
 	    else
 		fprintf (out, "From: %s\n", signature);
+	   
 #ifdef notdef
 	    if (!(msgflags & MVIS))
 		fprintf (out, "Bcc: Blind Distribution List: ;\n");
@@ -587,9 +603,17 @@ finish_headers (FILE *out)
 	case resent: 
 	    if (!(msgflags & MRDT))
 		fprintf (out, "Resent-Date: %s\n", dtimenow(0));
-	    if (msgflags & MRFM)
-		fprintf (out, "Resent-Sender: %s\n", from);
+	    if (msgflags & MRFM) {
+		/* There was already a Resent-From: in draft.  Don't add one. */
+		if (!draft_from_masquerading)
+		    /* mts.conf didn't contain "masquerade:[...]draft_from[...]"
+		       so we'll reveal the user's actual account@thismachine
+		       address in a Sender: header (and use it as the envelope
+		       From: later). */
+		    fprintf (out, "Resent-Sender: %s\n", from);
+	    }
 	    else
+		/* Construct a Resent-From: header. */
 		fprintf (out, "Resent-From: %s\n", signature);
 #ifdef notdef
 	    if (!(msgflags & MVIS))