BSD 4_3_Reno 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 ad61627..56b26b5 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -3,11 +3,23 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)recipient.c        5.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)recipient.c        5.18 (Berkeley) 6/1/90";

 #endif /* not lint */
 
 # include <sys/types.h>
 #endif /* not lint */
 
 # include <sys/types.h>


@@ -21,12 +33,6 @@ static char sccsid[] = "@(#)recipient.c      5.18 (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


@@ -35,10 +41,9 @@ static char sccsid[] = "@(#)recipient.c      5.18 (Berkeley) %G%";
 **                     expansion.
 **             sendq -- a pointer to the head of a queue to put
 **                     these people into.
 **                     expansion.
 **             sendq -- a pointer to the head of a queue to put
 **                     these people into.

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

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

-**             pointer to chain of addresses.
+**             none

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


@@ -46,20 +51,16 @@ static char sccsid[] = "@(#)recipient.c     5.18 (Berkeley) %G%";
 
 # define MAXRCRSN      10
 
 
 # define MAXRCRSN      10
 

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

        char *list;
        ADDRESS *ctladdr;
        ADDRESS **sendq;
        char *list;
        ADDRESS *ctladdr;
        ADDRESS **sendq;

-       u_short qflags;

 {
        register char *p;
        register ADDRESS *al;   /* list of addresses to send to */
        bool firstone;          /* set on first address sent */
        bool selfref;           /* set if this list includes ctladdr */
        char delimiter;         /* the address delimiter */
 {
        register char *p;
        register ADDRESS *al;   /* list of addresses to send to */
        bool firstone;          /* set on first address sent */
        bool selfref;           /* set if this list includes ctladdr */
        char delimiter;         /* the address delimiter */

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

 
        if (tTd(25, 1))
        {
 
        if (tTd(25, 1))
        {


@@ -94,9 +95,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 ||


@@ -116,73 +114,21 @@ sendto(list, copyf, ctladdr, qflags)
                ctladdr->q_flags |= QDONTSEND;
 
        /* arrange to send to everyone on the local send list */
                ctladdr->q_flags |= QDONTSEND;
 
        /* 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;
                extern ADDRESS *recipient();
        while (al != NULL)
        {
                register ADDRESS *a = al;
                extern ADDRESS *recipient();

-               extern ADDRESS *recipient();

 
                al = a->q_next;
                setctladdr(a);
 
                al = a->q_next;
                setctladdr(a);

-               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);

 
 

-                       /* 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;

        }
 
        CurEnv->e_to = NULL;
        }
 
        CurEnv->e_to = NULL;

-       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


@@ -196,13 +142,13 @@ addrref(a, r)
 **                     in this queue.
 **
 **     Returns:
 **                     in this queue.
 **
 **     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)
        register ADDRESS *a;
 ADDRESS *
 recipient(a, sendq)
        register ADDRESS *a;


@@ -230,7 +176,7 @@ recipient(a, sendq)
        if (AliasLevel > MAXRCRSN)
        {
                usrerr("aliasing/forwarding loop broken");
        if (AliasLevel > MAXRCRSN)
        {
                usrerr("aliasing/forwarding loop broken");

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

        }
 
        /*
        }
 
        /*


@@ -283,12 +229,10 @@ recipient(a, sendq)
                                printf("%s in sendq: ", a->q_paddr);
                                printaddr(q, FALSE);
                        }
                                printf("%s in sendq: ", a->q_paddr);
                                printaddr(q, FALSE);
                        }

-                       if (Verbose && !bitset(QDONTSEND|QPSEUDO, a->q_flags))
+                       if (!bitset(QDONTSEND, a->q_flags))

                                message(Arpa_Info, "duplicate suppressed");
                        if (!bitset(QPRIMARY, q->q_flags))
                                q->q_flags |= a->q_flags;
                                message(Arpa_Info, "duplicate suppressed");
                        if (!bitset(QPRIMARY, q->q_flags))
                                q->q_flags |= a->q_flags;

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

                        return (q);
                }
        }
                        return (q);
                }
        }


@@ -368,8 +312,6 @@ recipient(a, sendq)
                        {
                                char nbuf[MAXNAME];
 
                        {
                                char nbuf[MAXNAME];
 

-                               char nbuf[MAXNAME];
-

                                if (strcmp(a->q_user, pw->pw_name) != 0)
                                {
                                        a->q_user = newstr(pw->pw_name);
                                if (strcmp(a->q_user, pw->pw_name) != 0)
                                {
                                        a->q_user = newstr(pw->pw_name);


@@ -380,9 +322,6 @@ recipient(a, sendq)
                                a->q_gid = pw->pw_gid;
                                a->q_flags |= QGOODUID;
                                buildfname(pw->pw_gecos, pw->pw_name, nbuf);
                                a->q_gid = pw->pw_gid;
                                a->q_flags |= QGOODUID;
                                buildfname(pw->pw_gecos, pw->pw_name, nbuf);

-                               if (nbuf[0] != '\0')
-                                       a->q_fullname = newstr(nbuf);
-                               fullname(pw, nbuf);

                                if (nbuf[0] != '\0')
                                        a->q_fullname = newstr(nbuf);
                                if (!quoted)
                                if (nbuf[0] != '\0')
                                        a->q_fullname = newstr(nbuf);
                                if (!quoted)


@@ -391,8 +330,6 @@ recipient(a, sendq)
                }
        }
        return (a);
                }
        }
        return (a);

-
-       return (a);

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


@@ -445,11 +382,10 @@ finduser(name)
        {
                char buf[MAXNAME];
 
        {
                char buf[MAXNAME];
 

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

                if (index(buf, ' ') != NULL && !strcasecmp(buf, name))
                {
                if (index(buf, ' ') != NULL && !strcasecmp(buf, name))
                {

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

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


@@ -571,7 +507,7 @@ include(fname, msg, ctladdr, sendq)
                CurEnv->e_to = oldto;
                message(Arpa_Info, "%s to %s", msg, buf);
                AliasLevel++;
                CurEnv->e_to = oldto;
                message(Arpa_Info, "%s to %s", msg, buf);
                AliasLevel++;

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

                AliasLevel--;
        }
 
                AliasLevel--;
        }
 


@@ -615,7 +551,7 @@ sendtoargv(argv)
                                argv += 2;
                        }
                }
                                argv += 2;
                        }
                }

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

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