BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.sbin/sendmail/src/headers.c b/usr/src/usr.sbin/sendmail/src/headers.c
index 8b767ab..02950f0 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/headers.c
+++ b/usr/src/usr.sbin/sendmail/src/headers.c
@@ -3,11 +3,37 @@
  * 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, 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[] = "@(#)headers.c  5.15 (Berkeley) %G%";
+static char sccsid[] = "@(#)headers.c  5.15 (Berkeley) 6/1/90";

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


@@ -44,7 +70,6 @@ chompheader(line, def)
        bool cond = FALSE;
        BITMAP mopts;
        extern char *crackaddr();
        bool cond = FALSE;
        BITMAP mopts;
        extern char *crackaddr();

-       extern ADDRESS *sendto();

 
        if (tTd(31, 6))
                printf("chompheader: %s\n", line);
 
        if (tTd(31, 6))
                printf("chompheader: %s\n", line);


@@ -113,16 +138,6 @@ chompheader(line, def)
                        return (hi->hi_flags);
        }
 
                        return (hi->hi_flags);
        }
 

-       /* drop forged Sender: values */
-       p = "resent-sender";
-       if (!bitset(EF_RESENT, CurEnv->e_flags))
-               p += 7;
-       if (!def && !QueueRun && CurEnv->e_from.q_mailer == LocalMailer &&
-           bitset(H_VALID, hi->hi_flags))
-       {
-               return (hi->hi_flags);
-       }
-

        /* delete default value for this header */
        for (hp = &CurEnv->e_header; (h = *hp) != NULL; hp = &h->h_link)
        {
        /* delete default value for this header */
        for (hp = &CurEnv->e_header; (h = *hp) != NULL; hp = &h->h_link)
        {


@@ -146,7 +161,7 @@ chompheader(line, def)
                h->h_flags |= H_CHECK;
        if (h->h_value != NULL)
                free((char *) h->h_value);
                h->h_flags |= H_CHECK;
        if (h->h_value != NULL)
                free((char *) h->h_value);

-               (void) sendto(h->h_value, 0, (ADDRESS *) NULL, 0);
+       h->h_value = newstr(fvalue);

 
        /* hack to see if this is a new format message */
        if (!def && bitset(H_RCPT|H_FROM, h->h_flags) &&
 
        /* hack to see if this is a new format message */
        if (!def && bitset(H_RCPT|H_FROM, h->h_flags) &&