improve debugging in queue routines; don't output error addresses that

are duplicates or otherwise marked as "don't send"

SCCS-vsn: usr.sbin/sendmail/src/queue.c 5.20
SCCS-vsn: usr.sbin/sendmail/src/version.c 5.48

diff --git a/usr/src/usr.sbin/sendmail/src/queue.c b/usr/src/usr.sbin/sendmail/src/queue.c
index f9b3db3..3b290fb 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/queue.c
+++ b/usr/src/usr.sbin/sendmail/src/queue.c
@@ -17,12 +17,12 @@
 
 # ifndef QUEUE
 # ifndef lint
 
 # ifndef QUEUE
 # ifndef lint

-static char    SccsId[] = "@(#)queue.c 5.19 (Berkeley) %G%     (no queueing)";
+static char    SccsId[] = "@(#)queue.c 5.20 (Berkeley) %G%     (no queueing)";

 # endif not lint
 # else QUEUE
 
 # ifndef lint
 # endif not lint
 # else QUEUE
 
 # ifndef lint

-static char    SccsId[] = "@(#)queue.c 5.19 (Berkeley) %G%";
+static char    SccsId[] = "@(#)queue.c 5.20 (Berkeley) %G%";

 # endif not lint
 
 /*
 # endif not lint
 
 /*


@@ -160,7 +160,8 @@ queueup(e, queueall, announce)
        /* output list of error recipients */
        for (q = e->e_errorqueue; q != NULL; q = q->q_next)
        {
        /* output list of error recipients */
        for (q = e->e_errorqueue; q != NULL; q = q->q_next)
        {

-               fprintf(tfp, "E%s\n", q->q_paddr);
+               if (!bitset(QDONTSEND, q->q_flags))
+                       fprintf(tfp, "E%s\n", q->q_paddr);

        }
 
        /*
        }
 
        /*


@@ -705,6 +706,10 @@ readqf(e, full)
                printf("\nRunning %s\n", e->e_id);
        while (fgetfolded(buf, sizeof buf, qfp) != NULL)
        {
                printf("\nRunning %s\n", e->e_id);
        while (fgetfolded(buf, sizeof buf, qfp) != NULL)
        {

+# ifdef DEBUG
+               if (tTd(40, 4))
+                       printf("+++++ %s\n", buf);
+# endif DEBUG

                switch (buf[0])
                {
                  case 'R':             /* specify recipient */
                switch (buf[0])
                {
                  case 'R':             /* specify recipient */

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 20982e6..c7bc019 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -9,7 +9,7 @@
 */
 
 #ifndef lint
 */
 
 #ifndef lint

-static char    SccsId[] = "@(#)version.c       5.47 (Berkeley) %G%";
+static char    SccsId[] = "@(#)version.c       5.48 (Berkeley) %G%";

 #endif not lint
 
 #endif not lint
 

-char   Version[] = "5.47";
+char   Version[] = "5.48";