avoid bogus dups

SCCS-vsn: usr.sbin/sendmail/src/savemail.c 8.50

diff --git a/usr/src/usr.sbin/sendmail/src/savemail.c b/usr/src/usr.sbin/sendmail/src/savemail.c
index 618dd6a..ed8aeb7 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/savemail.c
+++ b/usr/src/usr.sbin/sendmail/src/savemail.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)savemail.c 8.49 (Berkeley) %G%";
+static char sccsid[] = "@(#)savemail.c 8.50 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -486,11 +486,20 @@ returntosender(msg, returnq, sendbody, e)
                if (bitset(QBADADDR, q->q_flags))
                        continue;
 
                if (bitset(QBADADDR, q->q_flags))
                        continue;
 

-               if (!bitset(QDONTSEND, q->q_flags))
-                       ee->e_nrcpts++;
-

                if (!DontPruneRoutes && pruneroute(q->q_paddr))
                if (!DontPruneRoutes && pruneroute(q->q_paddr))

+               {
+                       register ADDRESS *p;
+

                        parseaddr(q->q_paddr, q, RF_COPYPARSE, '\0', NULL, e);
                        parseaddr(q->q_paddr, q, RF_COPYPARSE, '\0', NULL, e);

+                       for (p = returnq; p != NULL; p = p->q_next)
+                       {
+                               if (p != q && sameaddr(p, q))
+                                       q->q_flags |= QDONTSEND;
+                       }
+               }
+
+               if (!bitset(QDONTSEND, q->q_flags))
+                       ee->e_nrcpts++;

 
                if (q->q_alias == NULL)
                        addheader("To", q->q_paddr, &ee->e_header);
 
                if (q->q_alias == NULL)
                        addheader("To", q->q_paddr, &ee->e_header);