fix suppression of from address in mailing lists.

SCCS-vsn: usr.sbin/sendmail/src/recipient.c 3.22
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.35

diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 73151ee..1af3764 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -3,7 +3,7 @@
 # include <sys/stat.h>
 # include "sendmail.h"
 
 # include <sys/stat.h>
 # include "sendmail.h"
 

-static char SccsId[] = "@(#)recipient.c        3.21    %G%";
+static char SccsId[] = "@(#)recipient.c        3.22    %G%";

 
 /*
 **  SENDTO -- Designate a send list.
 
 /*
 **  SENDTO -- Designate a send list.


@@ -140,9 +140,12 @@ recipient(a)
        }
 
        /*
        }
 
        /*

-       **  Look up this person in the recipient list.  If they
-       **  are there already, return, otherwise continue.
-       **  If the list is empty, just add it.
+       **  Look up this person in the recipient list.
+       **      If they are there already, return, otherwise continue.
+       **      If the list is empty, just add it.  Notice the cute
+       **      hack to make from addresses suppress things correctly:
+       **      the QDONTSEND bit will be set in the send list.
+       **      [Please note: the emphasis is on "hack."]

        */
 
        for (pq = &m->m_sendq; (q = *pq) != NULL; pq = &q->q_next)
        */
 
        for (pq = &m->m_sendq; (q = *pq) != NULL; pq = &q->q_next)


@@ -155,6 +158,7 @@ recipient(a)
 # endif DEBUG
                        if (Verbose && !bitset(QDONTSEND, a->q_flags))
                                message(Arpa_Info, "duplicate suppressed");
 # endif DEBUG
                        if (Verbose && !bitset(QDONTSEND, a->q_flags))
                                message(Arpa_Info, "duplicate suppressed");

+                       q->q_flags |= a->q_flags;

                        return;
                }
        }
                        return;
                }
        }

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index d03cd2d..3067811 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,3 +1,3 @@
-static char    SccsId[] = "@(#)SendMail version 3.34 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.35 of %G%";

 
 

-char   Version[] = "3.34 [%G%]";
+char   Version[] = "3.35 [%G%]";