BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.sbin/sendmail/src/deliver.c b/usr/src/usr.sbin/sendmail/src/deliver.c
index 4ba21ad..c8e05f1 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/deliver.c
+++ b/usr/src/usr.sbin/sendmail/src/deliver.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[] = "@(#)deliver.c  5.41 (Berkeley) %G%";
+static char sccsid[] = "@(#)deliver.c  5.41 (Berkeley) 3/21/91";

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


@@ -68,7 +94,7 @@ deliver(e, firstto)
        extern char *remotename();
 
        errno = 0;
        extern char *remotename();
 
        errno = 0;

-       if (!ForceMail && bitset(QDONTSEND|QPSEUDO, to->q_flags))
+       if (bitset(QDONTSEND, to->q_flags))

                return (0);
 
 #ifdef NAMED_BIND
                return (0);
 
 #ifdef NAMED_BIND


@@ -1081,9 +1107,7 @@ logdelivery(stat)
 \f/*
 **  PUTFROMLINE -- output a UNIX-style from line (or whatever)
 **
 \f/*
 **  PUTFROMLINE -- output a UNIX-style from line (or whatever)
 **

-**     then passes the rest of the message through.  If we have
-**     managed to extract a date already, use that; otherwise,
-**     use the current date/time.
+**     This can be made an arbitrary message separator by changing $l

 **
 **     One of the ugliest hacks seen by human eyes is contained herein:
 **     UUCP wants those stupid "remote from <host>" lines.  Why oh why
 **
 **     One of the ugliest hacks seen by human eyes is contained herein:
 **     UUCP wants those stupid "remote from <host>" lines.  Why oh why


@@ -1107,7 +1131,6 @@ putfromline(fp, m)
 {
        char *template = "\001l\n";
        char buf[MAXLINE];
 {
        char *template = "\001l\n";
        char buf[MAXLINE];

-       extern char SentDate[];

 
        if (bitnset(M_NHDR, m->m_flags))
                return;
 
        if (bitnset(M_NHDR, m->m_flags))
                return;