BSD 4_4_Lite1 release

[unix-history] / usr / src / usr.sbin / sendmail / src / recipient.c

diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 19b76cd..c6c15c4 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -3,11 +3,37 @@
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)recipient.c        8.42 (Berkeley) %G%";
+static char sccsid[] = "@(#)recipient.c        8.44 (Berkeley) 2/28/94";

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


@@ -19,12 +45,6 @@ static char sccsid[] = "@(#)recipient.c      8.42 (Berkeley) %G%";
 **     The parameter is a comma-separated list of people to send to.
 **     This routine arranges to send to all of them.
 **
 **     The parameter is a comma-separated list of people to send to.
 **     This routine arranges to send to all of them.
 **

-**     The `ctladdr' is the address that expanded to be this one,
-**     e.g., in an alias expansion.  This is used for a number of
-**     purposed, most notably inheritance of uid/gid for protection
-**     purposes.  It is also used to detect self-reference in group
-**     expansions and the like.
-**

 **     Parameters:
 **             list -- the send list.
 **             ctladdr -- the address template for the person to
 **     Parameters:
 **             list -- the send list.
 **             ctladdr -- the address template for the person to


@@ -34,10 +54,9 @@ static char sccsid[] = "@(#)recipient.c      8.42 (Berkeley) %G%";
 **             sendq -- a pointer to the head of a queue to put
 **                     these people into.
 **             e -- the envelope in which to add these recipients.
 **             sendq -- a pointer to the head of a queue to put
 **                     these people into.
 **             e -- the envelope in which to add these recipients.

-**             qflags -- special flags to set in the q_flags field.

 **
 **     Returns:
 **
 **     Returns:

-**             pointer to chain of addresses.
+**             The number of addresses actually on the list.

 **
 **     Side Effects:
 **             none.
 **
 **     Side Effects:
 **             none.


@@ -45,13 +64,11 @@ static char sccsid[] = "@(#)recipient.c     8.42 (Berkeley) %G%";
 
 # define MAXRCRSN      10
 
 
 # define MAXRCRSN      10
 

-ADDRESS *
-sendto(list, copyf, ctladdr, qflags)
+sendtolist(list, ctladdr, sendq, e)

        char *list;
        ADDRESS *ctladdr;
        ADDRESS **sendq;
        register ENVELOPE *e;
        char *list;
        ADDRESS *ctladdr;
        ADDRESS **sendq;
        register ENVELOPE *e;

-       u_short qflags;

 {
        register char *p;
        register ADDRESS *al;   /* list of addresses to send to */
 {
        register char *p;
        register ADDRESS *al;   /* list of addresses to send to */


@@ -59,8 +76,6 @@ sendto(list, copyf, ctladdr, qflags)
        char delimiter;         /* the address delimiter */
        int naddrs;
        char *oldto = e->e_to;
        char delimiter;         /* the address delimiter */
        int naddrs;
        char *oldto = e->e_to;

-       ADDRESS *sibl;          /* sibling pointer in tree */
-       ADDRESS *prev;          /* previous sibling */

 
        if (list == NULL)
        {
 
        if (list == NULL)
        {


@@ -101,9 +116,6 @@ sendto(list, copyf, ctladdr, qflags)
                        continue;
                a->q_next = al;
                a->q_alias = ctladdr;
                        continue;
                a->q_next = al;
                a->q_alias = ctladdr;

-               if (ctladdr != NULL)
-                       a->q_flags |= ctladdr->q_flags & ~QPRIMARY;
-               a->q_flags |= qflags;

 
                /* see if this should be marked as a primary address */
                if (ctladdr == NULL ||
 
                /* see if this should be marked as a primary address */
                if (ctladdr == NULL ||


@@ -117,72 +129,21 @@ sendto(list, copyf, ctladdr, qflags)
        }
 
        /* arrange to send to everyone on the local send list */
        }
 
        /* arrange to send to everyone on the local send list */

-       prev = sibl = NULL;
-       if (ctladdr != NULL)
-               prev = ctladdr->q_child;

        while (al != NULL)
        {
                register ADDRESS *a = al;
        while (al != NULL)
        {
                register ADDRESS *a = al;

-               extern ADDRESS *recipient();

 
                al = a->q_next;
 
                al = a->q_next;

-               sibl = recipient(a);
-               if (sibl != NULL)
-               {
-                       extern ADDRESS *addrref();
-
-                       /* inherit full name */
-                       if (sibl->q_fullname == NULL && ctladdr != NULL)
-                               sibl->q_fullname = ctladdr->q_fullname;
+               a = recipient(a, sendq, e);

 
 

-                       /* link tree together (but only if the node is new) */
-                       if (sibl == a)
-                       {
-                               sibl->q_sibling = prev;
-                               prev = sibl;
-                       }
-               }
+               /* arrange to inherit full name */
+               if (a->q_fullname == NULL && ctladdr != NULL)
+                       a->q_fullname = ctladdr->q_fullname;
+               naddrs++;

        }
 
        e->e_to = oldto;
        return (naddrs);
        }
 
        e->e_to = oldto;
        return (naddrs);

-       if (ctladdr != NULL)
-               ctladdr->q_child = prev;
-       return (prev);
-}
-\f/*
-**  ADDRREF -- return pointer to address that references another address.
-**
-**     Parameters:
-**             a -- address to check.
-**             r -- reference to find.
-**
-**     Returns:
-**             address of node in tree rooted at 'a' that references
-**                     'r'.
-**             NULL if no such node exists.
-**
-**     Side Effects:
-**             none.
-*/
-
-ADDRESS *
-addrref(a, r)
-       register ADDRESS *a;
-       register ADDRESS *r;
-{
-       register ADDRESS *q;
-
-       while (a != NULL)
-       {
-               if (a->q_child == r || a->q_sibling == r)
-                       return (a);
-               q = addrref(a->q_child, r);
-               if (q != NULL)
-                       return (q);
-               a = a->q_sibling;
-       }
-       return (NULL);

 }
 \f/*
 **  RECIPIENT -- Designate a message recipient
 }
 \f/*
 **  RECIPIENT -- Designate a message recipient


@@ -197,13 +158,13 @@ addrref(a, r)
 **             e -- the current envelope.
 **
 **     Returns:
 **             e -- the current envelope.
 **
 **     Returns:

-**             pointer to address actually inserted in send list.
+**             The actual address in the queue.  This will be "a" if
+**             the address is not a duplicate, else the original address.

 **
 **     Side Effects:
 **             none.
 */
 
 **
 **     Side Effects:
 **             none.
 */
 

-ADDRESS *

 ADDRESS *
 recipient(a, sendq, e)
        register ADDRESS *a;
 ADDRESS *
 recipient(a, sendq, e)
        register ADDRESS *a;


@@ -241,7 +202,7 @@ recipient(a, sendq, e)
        if (AliasLevel > MAXRCRSN)
        {
                usrerr("554 aliasing/forwarding loop broken");
        if (AliasLevel > MAXRCRSN)
        {
                usrerr("554 aliasing/forwarding loop broken");

-               return (NULL);
+               return (a);

        }
 
        /*
        }
 
        /*


@@ -295,10 +256,6 @@ recipient(a, sendq, e)
        {
                if (sameaddr(q, a))
                {
        {
                if (sameaddr(q, a))
                {

-                       /* if this is a reinsertion, just go ahead */
-                       if (bitset(QVERIFIED, q->q_flags))
-                               break;
-

                        if (tTd(26, 1))
                        {
                                printf("%s in sendq: ", a->q_paddr);
                        if (tTd(26, 1))
                        {
                                printf("%s in sendq: ", a->q_paddr);


@@ -312,20 +269,14 @@ recipient(a, sendq, e)
                        }
                        else if (bitset(QSELFREF, q->q_flags))
                                q->q_flags |= a->q_flags & ~QDONTSEND;
                        }
                        else if (bitset(QSELFREF, q->q_flags))
                                q->q_flags |= a->q_flags & ~QDONTSEND;

-                       if (!bitset(QPSEUDO, a->q_flags))
-                               q->q_flags &= ~QPSEUDO;
-                       return (q);
+                       a = q;
+                       goto testselfdestruct;

                }
        }
 
        /* add address on list */
                }
        }
 
        /* add address on list */

-       if (*pq != a)
-       {
-               *pq = a;
-               a->q_next = NULL;
-       }
-
-       a->q_flags &= ~QVERIFIED;
+       *pq = a;
+       a->q_next = NULL;

 
        /*
        **  Alias the name and handle special mailer types.
 
        /*
        **  Alias the name and handle special mailer types.


@@ -356,8 +307,9 @@ recipient(a, sendq, e)
                        {
 #ifdef LOG
                                if (LogLevel > 2)
                        {
 #ifdef LOG
                                if (LogLevel > 2)

-                                       syslog(LOG_ERR, "%s: include %s: transient error: %e",
-                                               e->e_id, a->q_user, errstring(ret));
+                                       syslog(LOG_ERR, "%s: include %s: transient error: %s",
+                                               e->e_id == NULL ? "NOQUEUE" : e->e_id,
+                                               a->q_user, errstring(ret));

 #endif
                                a->q_flags |= QQUEUEUP;
                                a->q_flags &= ~QDONTSEND;
 #endif
                                a->q_flags |= QQUEUEUP;
                                a->q_flags &= ~QDONTSEND;


@@ -425,7 +377,8 @@ recipient(a, sendq, e)
 # ifdef LOG
                        if (LogLevel > 8)
                                syslog(LOG_INFO, "%s: deferred: udbexpand: %s",
 # ifdef LOG
                        if (LogLevel > 8)
                                syslog(LOG_INFO, "%s: deferred: udbexpand: %s",

-                                       e->e_id, errstring(errno));
+                                       e->e_id == NULL ? "NOQUEUE" : e->e_id,
+                                       errstring(errno));

 # endif
                        message("queued (user database error): %s",
                                errstring(errno));
 # endif
                        message("queued (user database error): %s",
                                errstring(errno));


@@ -538,8 +491,6 @@ recipient(a, sendq, e)
                }
        }
        return (a);
                }
        }
        return (a);

-
-       return (a);

 }
 \f/*
 **  FINDUSER -- find the password entry for a user.
 }
 \f/*
 **  FINDUSER -- find the password entry for a user.


@@ -618,13 +569,13 @@ finduser(name, fuzzyp)
        {
                char buf[MAXNAME];
 
        {
                char buf[MAXNAME];
 

-               fullname(pw, buf);
+               buildfname(pw->pw_gecos, pw->pw_name, buf);

                if (strchr(buf, ' ') != NULL && !strcasecmp(buf, name))
                {
                        if (tTd(29, 4))
                                printf("fuzzy matches %s\n", pw->pw_name);
                if (strchr(buf, ' ') != NULL && !strcasecmp(buf, name))
                {
                        if (tTd(29, 4))
                                printf("fuzzy matches %s\n", pw->pw_name);

-                               message(Arpa_Info, "sending to %s <%s>",
-                                   buf, pw->pw_name);
+                       message("sending to login name %s", pw->pw_name);
+                       *fuzzyp = TRUE;

                        return (pw);
                }
        }
                        return (pw);
                }
        }


@@ -1024,11 +975,12 @@ resetuid:
 #ifdef LOG
                if (forwarding && LogLevel > 9)
                        syslog(LOG_INFO, "%s: forward %s => %s",
 #ifdef LOG
                if (forwarding && LogLevel > 9)
                        syslog(LOG_INFO, "%s: forward %s => %s",

-                               e->e_id, oldto, buf);
+                               e->e_id == NULL ? "NOQUEUE" : e->e_id,
+                               oldto, buf);

 #endif
 
                AliasLevel++;
 #endif
 
                AliasLevel++;

-               sendto(buf, 1, ctladdr, 0);
+               nincludes += sendtolist(buf, ctladdr, sendq, e);

                AliasLevel--;
        }
 
                AliasLevel--;
        }
 


@@ -1079,7 +1031,7 @@ sendtoargv(argv, e)
 
        while ((p = *argv++) != NULL)
        {
 
        while ((p = *argv++) != NULL)
        {

-               sendto(p, 0, (ADDRESS *) NULL, 0);
+               (void) sendtolist(p, NULLADDR, &e->e_sendqueue, e);

        }
 }
 \f/*
        }
 }
 \f/*