Changed some string terminations from NULL to \0.

[mmh] / uip / post.c

diff --git a/uip/post.c b/uip/post.c
index a66e241..abc2285 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -283,7 +283,7 @@ static char *fill_in = NULL;
 static char *partno = NULL;
 static int queued = 0;
 
-extern int  MMailids;
+extern boolean  draft_from_masquerading;  /* defined in mts.c */
 
 /*
  * static prototypes
@@ -726,14 +726,6 @@ putfmt (char *name, char *str, FILE *out)
     tmpaddrs.m_next = NULL;
     for (count = 0; (cp = getname (str)); count++)
        if ((mp = getm (cp, NULL, 0, AD_HOST, NULL))) {
-           if (MMailids && (hdr->set & MFRM))
-               /* The user manually specified a From: address in their draft
-                  and mts.conf turned on "mmailid", so we'll set things up to
-                  use the actual email address embedded in the draft From:
-                  (without the GECOS full name or angle brackets) as the
-                  envelope From:. */
-               strncpy(from, auxformat(mp, 0), sizeof(from) - 1);
-
            if (tmpaddrs.m_next)
                np->m_next = mp;
            else
@@ -764,7 +756,8 @@ putfmt (char *name, char *str, FILE *out)
 
     for (grp = 0, mp = tmpaddrs.m_next; mp; mp = np)
        if (mp->m_nohost) {     /* also used to test (hdr->flags & HTRY) */
-           pp = akvalue (mp->m_mbox);
+           /* The address doesn't include a host, so it might be an alias. */
+           pp = akvalue (mp->m_mbox);  /* do mh alias substitution */
            qp = akvisible () ? mp->m_mbox : "";
            np = mp;
            if (np->m_gname)
@@ -774,6 +767,19 @@ putfmt (char *name, char *str, FILE *out)
                    badadr++;
                    continue;
                }
+
+               if (draft_from_masquerading && ((msgstate == RESENT)
+                                               ? (hdr->set & MRFM)
+                                               : (hdr->set & MFRM)))
+                   /* The user manually specified a [Resent-]From: address in
+                      their draft and the "masquerade:" line in mts.conf
+                      doesn't contain "draft_from", so we'll set things up to
+                      use the actual email address embedded in the draft
+                      [Resent-]From: (after alias substitution, and without the
+                      GECOS full name or angle brackets) as the envelope
+                      From:. */
+                   strncpy(from, auxformat(mp, 0), sizeof(from) - 1);
+
                if (hdr->flags & HBCC)
                    mp->m_bcc++;
                if (np->m_ingrp)
@@ -793,6 +799,19 @@ putfmt (char *name, char *str, FILE *out)
            mnfree (mp);
        }
        else {
+           /* Address includes a host, so no alias substitution is needed. */
+           if (draft_from_masquerading && ((msgstate == RESENT)
+                                           ? (hdr->set & MRFM)
+                                           : (hdr->set & MFRM)))
+               /* The user manually specified a [Resent-]From: address in
+                  their draft and the "masquerade:" line in mts.conf
+                  doesn't contain "draft_from", so we'll set things up to
+                  use the actual email address embedded in the draft
+                  [Resent-]From: (after alias substitution, and without the
+                  GECOS full name or angle brackets) as the envelope
+                  From:. */
+               strncpy(from, auxformat(mp, 0), sizeof(from) - 1);
+
            if (hdr->flags & HBCC)
                mp->m_bcc++;
            if (mp->m_gname)
@@ -875,10 +894,11 @@ finish_headers (FILE *out)
                        (int) getpid (), (long) tclock, LocalName ());
            if (msgflags & MFRM) {
                /* There was already a From: in the draft.  Don't add one. */
-               if (!MMailids)
-                   /* mts.conf didn't turn on mmailid, so we'll reveal the
-                      user's actual account@thismachine address in a Sender:
-                      header (and use it as the envelope From: later). */
+               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
@@ -911,9 +931,17 @@ finish_headers (FILE *out)
            if (msgid)
                fprintf (out, "Resent-Message-ID: <%d.%ld@%s>\n",
                        (int) getpid (), (long) tclock, LocalName ());
-           if (msgflags & MRFM)
-               fprintf (out, "Resent-Sender: %s\n", from);
+           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
+               /* Construct a Resent-From: header. */
                fprintf (out, "Resent-From: %s\n", signature);
            if (whomsw)
                break;