Removed draft_from masquerading.

[mmh] / uip / spost.c

diff --git a/uip/spost.c b/uip/spost.c
index ee36a6f..8fc2f21 100644 (file)
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -155,8 +155,6 @@ extern char *sendmail;
 extern char *getfullname(void);
 extern char *getusername(void);
 
-extern boolean  draft_from_masquerading;  /* defined in mts.c */
-
 /*
 ** static prototypes
 */
@@ -555,13 +553,8 @@ finish_headers(FILE *out)
        }
        if (!(msgflags & MFRM)) {
                fprintf(out, "%sFrom: %s\n", resentstr, signature);
-       } else 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).
-               */
+       } else {
+               /* Add a Sender: header in case the From: header is fake. */
                fprintf(out, "%sSender: %s\n", resentstr, from);
        }
 #ifdef notdef
@@ -724,13 +717,8 @@ make_bcc_file(void)
        if (!(msgflags & MFRM)) {
                /* Construct a From: header. */
                fprintf(out, "From: %s\n", signature);
-       } else 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).
-               */
+       } else {
+               /* Add a Sender: header in case the From: header is fake. */
                fprintf(out, "Sender: %s\n", from);
        }
        if (subject)