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

diff --git a/uip/spost.c b/uip/spost.c
index e2b43bd..1c1a8bc 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -21,8 +21,6 @@
 #include <h/mts.h>
 #include <h/utils.h>
 
-#define	uptolow(c)	((isalpha(c) && isupper (c)) ? tolower (c) : c)
-
 #define MAX_SM_FIELD	1476	/* < largest hdr field sendmail will accept */
 #define FCCS		10	/* max number of fccs allowed */
 
@@ -193,7 +191,7 @@ static void finish_headers (FILE *);
 static int get_header (char *, struct headers *);
 static void putadr (char *, struct mailname *);
 static int putone (char *, int, int);
-static void insert_fcc (struct headers *, char *);
+static void insert_fcc (struct headers *, unsigned char *);
 static void file (char *);
 static void fcc (char *, char *);
 
@@ -633,7 +631,7 @@ get_header (char *header, struct headers *table)
     struct headers *h;
 
     for (h = table; h->value; h++)
-	if (!strcasecmp (header, h->value))
+	if (!mh_strcasecmp (header, h->value))
 	    return (h - table);
 
     return NOTOK;
@@ -722,9 +720,9 @@ putone (char *adr, int pos, int indent)
 
 
 static void
-insert_fcc (struct headers *hdr, char *pp)
+insert_fcc (struct headers *hdr, unsigned char *pp)
 {
-    char   *cp;
+    unsigned char   *cp;
 
     for (cp = pp; isspace (*cp); cp++)
 	continue;
@@ -763,7 +761,18 @@ make_bcc_file (void)
     chmod (bccfil, 0600);
 
     fprintf (out, "Date: %s\n", dtimenow (0));
-    fprintf (out, "From: %s\n", signature);
+    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
+      /* Construct a From: header. */
+      fprintf (out, "From: %s\n", signature);
     if (subject)
 	fprintf (out, "Subject: %s", subject);
     fprintf (out, "BCC:\n\n------- Blind-Carbon-Copy\n\n");