X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpost.c;h=ff7519760541f6f5e03962ff420597cc22eee9cb;hb=fc15b3f63b8e802f8d6dbc36fd35c0e400313a91;hp=edc17d79ef01cb4044898b884252c7ed3d42f781;hpb=9f8f8b1e1d553774865f2c177191c359c3dc652c;p=mmh

diff --git a/uip/post.c b/uip/post.c
index edc17d7..ff75197 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -262,6 +262,7 @@ static char bccfil[BUFSIZ];
 static char from[BUFSIZ];	/* my network address            */
 static char sender[BUFSIZ];	/* my Sender: header		 */
 static char efrom[BUFSIZ];	/* my Envelope-From: header	 */
+static char fullfrom[BUFSIZ];	/* full contents of From header  */
 static char signature[BUFSIZ];	/* my signature                  */
 static char *filter = NULL;	/* the filter for BCC'ing        */
 static char *subject = NULL;	/* the subject field for BCC'ing */
@@ -708,7 +709,21 @@ putfmt (char *name, char *str, FILE *out)
     }
 
     if ((i = get_header (name, hdrtab)) == NOTOK) {
-	fprintf (out, "%s: %s", name, str);
+	if (strncasecmp (name, "nmh-", 4)) {
+	    fprintf (out, "%s: %s", name, str);
+	} else {
+	    /* Filter out all Nmh-* headers, because Norm asked.  They
+	       should never have reached this point.  Warn about any
+	       that are non-empty. */
+	    if (strcmp (str, "\n")) {
+		char *newline = strchr (str, '\n');
+		if (newline) *newline = '\0';
+		if (! whomsw) {
+		    advise (NULL, "ignoring header line -- %s: %s", name, str);
+		}
+	    }
+	}
+
 	return;
     }
 
@@ -900,6 +915,23 @@ putfmt (char *name, char *str, FILE *out)
 		mnfree (mp);
 	}
 
+    /*
+     * If this is a From:/Resent-From: header, save the full thing for
+     * later in case we need it for use when constructing a Bcc draft message
+     */
+
+    if ((msgstate == RESENT) ? (hdr->set & MRFM) : (hdr->set & MFRM)) {
+    	strncpy(fullfrom, str, sizeof(fullfrom));
+	fullfrom[sizeof(fullfrom) - 1] = 0;
+	/*
+	 * Strip off any trailing newlines
+	 */
+
+	while (strlen(fullfrom) > 0 && fullfrom[strlen(fullfrom) - 1] == '\n') {
+	    fullfrom[strlen(fullfrom) - 1] = '\0';
+	}
+    }
+
     if (grp > 0 && (hdr->flags & HNGR)) {
 	advise (NULL, "%s: field does not allow groups", name);
 	badmsg++;
@@ -928,6 +960,7 @@ start_headers (void)
     from[0] = '\0';
     efrom[0] = '\0';
     sender[0] = '\0';
+    fullfrom[0] = '\0';
 
     if ((cp = getfullname ()) && *cp) {
 	strncpy (sigbuf, cp, sizeof(sigbuf));
@@ -1279,9 +1312,9 @@ make_bcc_file (int dashstuff)
 
     tfile = m_mktemp2(NULL, "bccs", NULL, &out);
     if (tfile == NULL) adios("bcc", "unable to create temporary file");
-    chmod (bccfil, 0600);
     strncpy (bccfil, tfile, sizeof(bccfil));
 
+    fprintf (out, "From: %s\n", fullfrom);
     fprintf (out, "Date: %s\n", dtime (&tclock, 0));
     if (msgid)
 	fprintf (out, "Message-ID: %s\n", message_id (tclock, 0));