don't put commas in non-address fields; have -bq clean up its temp files

SCCS-vsn: usr.sbin/sendmail/src/main.c 3.114
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.203
SCCS-vsn: usr.sbin/sendmail/src/queue.c 3.44

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 5e18914..d59f6a3 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -6,7 +6,7 @@
 # include "sendmail.h"
 # include <sys/stat.h>
 
 # include "sendmail.h"
 # include <sys/stat.h>
 

-SCCSID(@(#)main.c      3.113           %G%);
+SCCSID(@(#)main.c      3.114           %G%);

 
 /*
 **  SENDMAIL -- Post mail to a set of destinations.
 
 /*
 **  SENDMAIL -- Post mail to a set of destinations.


@@ -633,7 +633,7 @@ main(argc, argv)
        else if (Mode == MD_QUEUE)
        {
                queueup(CurEnv, TRUE);
        else if (Mode == MD_QUEUE)
        {
                queueup(CurEnv, TRUE);

-               exit(ExitStat);
+               finis();

        }
 
        initsys();
        }
 
        initsys();

diff --git a/usr/src/usr.sbin/sendmail/src/queue.c b/usr/src/usr.sbin/sendmail/src/queue.c
index a758a29..3b32a04 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.43            %G%     (no queueing));
+SCCSID(@(#)queue.c     3.44            %G%     (no queueing));

 # else QUEUE
 
 # else QUEUE
 

-SCCSID(@(#)queue.c     3.43            %G%);
+SCCSID(@(#)queue.c     3.44            %G%);

 
 /*
 **  QUEUEUP -- queue a message up for future transmission.
 
 /*
 **  QUEUEUP -- queue a message up for future transmission.


@@ -122,7 +122,9 @@ queueup(e, queueall)
 # endif DEBUG
                if (queueall ? !bitset(QDONTSEND, q->q_flags) :
                               bitset(QQUEUEUP, q->q_flags))
 # endif DEBUG
                if (queueall ? !bitset(QDONTSEND, q->q_flags) :
                               bitset(QQUEUEUP, q->q_flags))

+               {

                        fprintf(tfp, "R%s\n", q->q_paddr);
                        fprintf(tfp, "R%s\n", q->q_paddr);

+               }

        }
 
        /* output headers for this message */
        }
 
        /* output headers for this message */


@@ -139,8 +141,10 @@ queueup(e, queueall)
                        (void) expand(h->h_value, buf, &buf[sizeof buf], e);
                        fprintf(tfp, "%s: %s\n", h->h_field, buf);
                }
                        (void) expand(h->h_value, buf, &buf[sizeof buf], e);
                        fprintf(tfp, "%s: %s\n", h->h_field, buf);
                }

-               else
+               else if (bitset(H_FROM|H_RCPT, h->h_flags))

                        commaize(h, h->h_value, tfp, e->e_oldstyle, NULL);
                        commaize(h, h->h_value, tfp, e->e_oldstyle, NULL);

+               else
+                       fprintf(tfp, "%s: %s\n", h->h_field, h->h_value);

        }
 
        /*
        }
 
        /*


@@ -162,8 +166,9 @@ queueup(e, queueall)
                syslog(LOG_DEBUG, "%s: queueup, qf=%s, df=%s\n", e->e_id, qf, e->e_df);
 # endif LOG
 
                syslog(LOG_DEBUG, "%s: queueup, qf=%s, df=%s\n", e->e_id, qf, e->e_df);
 # endif LOG
 

-       /* disconnect this temp file from the job */
+       /* disconnect this temp file from the job; don't requeue later */

        e->e_df = NULL;
        e->e_df = NULL;

+       e->e_dontqueue = TRUE;

 }
 \f/*
 **  RUNQUEUE -- run the jobs in the queue.
 }
 \f/*
 **  RUNQUEUE -- run the jobs in the queue.

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 27d5723..bdb2e1c 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.202 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.203 of %G%";

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.202 [%G%]";
+char   Version[] = "3.203 [%G%]";