Don't artifically add a "from: $q" when running the queue -- this seems

to cause the from line in the qf file to be ignored.

SCCS-mr: usr.sbin/sendmail/src/headers.c 207
SCCS-mr: usr.sbin/sendmail/src/queue.c 207
SCCS-mr: usr.sbin/sendmail/src/version.c 207
SCCS-vsn: usr.sbin/sendmail/src/headers.c 3.54
SCCS-vsn: usr.sbin/sendmail/src/queue.c 3.72
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.327

diff --git a/usr/src/usr.sbin/sendmail/src/headers.c b/usr/src/usr.sbin/sendmail/src/headers.c
index 93023db..a136a21 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/headers.c
+++ b/usr/src/usr.sbin/sendmail/src/headers.c
@@ -1,7 +1,7 @@
 # include <errno.h>
 # include "sendmail.h"
 
 # include <errno.h>
 # include "sendmail.h"
 

-SCCSID(@(#)headers.c   3.53            %G%);
+SCCSID(@(#)headers.c   3.54            %G%);

 
 /*
 **  CHOMPHEADER -- process and save a header line.
 
 /*
 **  CHOMPHEADER -- process and save a header line.


@@ -102,7 +102,7 @@ chompheader(line, def)
                return (hi->hi_flags);
 
        /* drop explicit From: if same as what we would generate -- for MH */
                return (hi->hi_flags);
 
        /* drop explicit From: if same as what we would generate -- for MH */

-       if (!def && strcmp(fvalue, CurEnv->e_from.q_paddr) == 0)
+       if (!def && !QueueRun && strcmp(fvalue, CurEnv->e_from.q_paddr) == 0)

        {
                p = "resent-from";
                if (!bitset(EF_RESENT, CurEnv->e_flags))
        {
                p = "resent-from";
                if (!bitset(EF_RESENT, CurEnv->e_flags))

diff --git a/usr/src/usr.sbin/sendmail/src/queue.c b/usr/src/usr.sbin/sendmail/src/queue.c
index 2960f3c..547a083 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/queue.c
+++ b/usr/src/usr.sbin/sendmail/src/queue.c
@@ -5,10 +5,10 @@
 # include <errno.h>
 
 # ifndef QUEUE
 # include <errno.h>
 
 # ifndef QUEUE

-SCCSID(@(#)queue.c     3.71            %G%     (no queueing));
+SCCSID(@(#)queue.c     3.72            %G%     (no queueing));

 # else QUEUE
 
 # else QUEUE
 

-SCCSID(@(#)queue.c     3.71            %G%);
+SCCSID(@(#)queue.c     3.72            %G%);

 
 /*
 **  Work queue.
 
 /*
 **  Work queue.


@@ -506,7 +506,6 @@ dowork(w)
 
                /* don't use the headers from sendmail.cf... */
                CurEnv->e_header = NULL;
 
                /* don't use the headers from sendmail.cf... */
                CurEnv->e_header = NULL;

-               (void) chompheader("from: $q", TRUE);

 
                /* create the link to the control file during processing */
                if (link(w->w_name, queuename(CurEnv, 'l')) < 0)
 
                /* create the link to the control file during processing */
                if (link(w->w_name, queuename(CurEnv, 'l')) < 0)

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index a16634f..64dee13 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,5 +1,5 @@
 # ifndef lint
 # ifndef lint

-static char    SccsId[] = "@(#)SendMail version 3.326 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.327 of %G%";

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.326";
+char   Version[] = "3.327";