X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6a0b804e4d6562952662dd618e9feca755c10fff..c2a2ca7d8d72c5a8bdadcd6f2c4dcf3c314a1066:/uip/spost.c

diff --git a/uip/spost.c b/uip/spost.c
index 7454c896..4133f866 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -172,8 +172,6 @@ extern char *sendmail;
 extern char *getfullname (void);
 extern char *getusername (void);
 
-extern boolean  draft_from_masquerading;  /* defined in mts.c */
-
 /*
  * static prototypes
  */
@@ -565,16 +563,7 @@ finish_headers (FILE *out)
 	    if (!(msgflags & MDAT))
 		fprintf (out, "Date: %s\n", dtimenow (0));
 	    
-	    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
+	    if (!(msgflags & MFRM))
 		fprintf (out, "From: %s\n", signature);
 	   
 #ifdef notdef
@@ -586,16 +575,7 @@ finish_headers (FILE *out)
 	case resent: 
 	    if (!(msgflags & MRDT))
 		fprintf (out, "Resent-Date: %s\n", dtimenow(0));
-	    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
+	    if (!(msgflags & MRFM))
 		/* Construct a Resent-From: header. */
 		fprintf (out, "Resent-From: %s\n", signature);
 #ifdef notdef
@@ -740,16 +720,7 @@ make_bcc_file (void)
     chmod (bccfil, 0600);
 
     fprintf (out, "Date: %s\n", dtimenow (0));
-    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
+    if (!(msgflags & MFRM))
       /* Construct a From: header. */
       fprintf (out, "From: %s\n", signature);
     if (subject)