X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fspost.c;h=fef583e52b57de345769ac3a37437d5b490bb07e;hb=57cd23b8807fa351800ba7277c5636a133241166;hp=6defbacc164962317ec8901189b7201e79b9b6c5;hpb=4548981fb45fbc917cc2c26b7c96b31cfa14bc9b;p=mmh

diff --git a/uip/spost.c b/uip/spost.c
index 6defbac..fef583e 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -112,6 +112,7 @@ static struct headers NHeaders[] = {
     { "Bcc",         HADR|HTRY|HBCC|HNIL, MINV },
     { "Message-Id",  HBAD,                0 },
     { "Fcc",         HFCC,                0 },
+    { "Envelope-From",HIGN,               0 },
     { NULL,          0,                   0 }
 };
 
@@ -128,6 +129,7 @@ static struct headers RHeaders[] = {
     { "Resent-Fcc",        HFCC,           0 },
     { "Reply-To",          HADR,           0 },
     { "Fcc",               HIGN,           0 },
+    { "Envelope-From",     HIGN,           0 },
     { NULL,                0,              0 }
 };
 
@@ -170,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
  */
@@ -224,10 +224,10 @@ main (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [switches] file", invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case DEBUGSW: 
 		    debug++;
@@ -428,7 +428,7 @@ main (int argc, char **argv)
 
     if (pushflg && !(watch || verbose)) {
 	/* fork to a child to run sendmail */
-	for (i=0; (pid = m_vfork()) == NOTOK && i < 5; i++)
+	for (i=0; (pid = vfork()) == NOTOK && i < 5; i++)
 	    sleep(5);
 	switch (pid) {
 	    case NOTOK:
@@ -563,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
@@ -584,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
@@ -738,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)
@@ -764,7 +737,7 @@ make_bcc_file (void)
     else {
 	vec[0] = r1bindex (mhlproc, '/');
 
-	for (i = 0; (child_id = m_vfork()) == NOTOK && i < 5; i++)
+	for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
 	    sleep (5);
 	switch (child_id) {
 	    case NOTOK: 
@@ -825,7 +798,7 @@ fcc (char *file, char *folder)
 	printf ("%sFcc: %s\n", msgstate == resent ? "Resent-" : "", folder);
     fflush (stdout);
 
-    for (i = 0; (child_id = m_vfork()) == NOTOK && i < 5; i++)
+    for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
 	sleep (5);
     switch (child_id) {
 	case NOTOK: