avoid loops by not sending to owner-owner-* -- just send to

owner-owner instead

SCCS-vsn: usr.sbin/sendmail/src/version.c 3.114
SCCS-vsn: usr.sbin/sendmail/src/deliver.c 3.83

diff --git a/usr/src/usr.sbin/sendmail/src/deliver.c b/usr/src/usr.sbin/sendmail/src/deliver.c
index 3e8197d..cf3aa02 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/deliver.c
+++ b/usr/src/usr.sbin/sendmail/src/deliver.c
@@ -6,7 +6,7 @@
 # include <syslog.h>
 # endif LOG
 
 # include <syslog.h>
 # endif LOG
 

-SCCSID(@(#)deliver.c   3.82            %G%);
+SCCSID(@(#)deliver.c   3.83            %G%);

 
 /*
 **  DELIVER -- Deliver a message to a list of addresses.
 
 /*
 **  DELIVER -- Deliver a message to a list of addresses.


@@ -1503,7 +1503,10 @@ sendall(e, verifyonly)
 
                        /* see if the owner list exists */
                        (void) strcpy(obuf, "owner-");
 
                        /* see if the owner list exists */
                        (void) strcpy(obuf, "owner-");

-                       (void) strcat(obuf, qq->q_user);
+                       if (strncmp(qq->q_user, "owner-", 6) == 0)
+                               (void) strcat(obuf, "owner");
+                       else
+                               (void) strcat(obuf, qq->q_user);

                        if (aliaslookup(obuf) == NULL)
                                continue;
 
                        if (aliaslookup(obuf) == NULL)
                                continue;
 

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

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.113 [%G%]";
+char   Version[] = "3.114 [%G%]";