BSD 4_4_Lite1 release

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

diff --git a/usr/src/usr.sbin/sendmail/src/envelope.c b/usr/src/usr.sbin/sendmail/src/envelope.c
index 96fc853..3a2314c 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/envelope.c
+++ b/usr/src/usr.sbin/sendmail/src/envelope.c
@@ -3,15 +3,40 @@
  * 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[] = "@(#)envelope.c 8.27 (Berkeley) %G%";
+static char sccsid[] = "@(#)envelope.c 8.34 (Berkeley) 4/14/94";

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

-#include <sys/time.h>

 #include <pwd.h>
 
 /*
 #include <pwd.h>
 
 /*


@@ -185,7 +210,8 @@ dropenvelope(e)
        **  Send back return receipts as requested.
        */
 
        **  Send back return receipts as requested.
        */
 

-       if (e->e_receiptto != NULL && bitset(EF_SENDRECEIPT, e->e_flags))
+       if (e->e_receiptto != NULL && bitset(EF_SENDRECEIPT, e->e_flags)
+           && !bitset(PRIV_NORECEIPTS, PrivacyFlags))

        {
                auto ADDRESS *rlist = NULL;
 
        {
                auto ADDRESS *rlist = NULL;
 


@@ -559,7 +585,7 @@ setsender(from, e, delimptr, internal)
        */
 
        if (bitset(EF_QUEUERUN, e->e_flags) || OpMode == MD_SMTP ||
        */
 
        if (bitset(EF_QUEUERUN, e->e_flags) || OpMode == MD_SMTP ||

-           OpMode == MD_DAEMON)
+           OpMode == MD_ARPAFTP || OpMode == MD_DAEMON)

                realname = from;
        if (realname == NULL || realname[0] == '\0')
                realname = username();
                realname = from;
        if (realname == NULL || realname[0] == '\0')
                realname = username();


@@ -668,9 +694,11 @@ setsender(from, e, delimptr, internal)
                        **  Process passwd file entry.
                        */
 
                        **  Process passwd file entry.
                        */
 

-

                        /* extract home directory */
                        /* extract home directory */

-                       e->e_from.q_home = newstr(pw->pw_dir);
+                       if (strcmp(pw->pw_dir, "/") == 0)
+                               e->e_from.q_home = newstr("");
+                       else
+                               e->e_from.q_home = newstr(pw->pw_dir);

                        define('z', e->e_from.q_home, e);
 
                        /* extract user and group id */
                        define('z', e->e_from.q_home, e);
 
                        /* extract user and group id */


@@ -683,9 +711,7 @@ setsender(from, e, delimptr, internal)
                            strcmp(pw->pw_name, e->e_from.q_user) == 0 &&
                            !internal)
                        {
                            strcmp(pw->pw_name, e->e_from.q_user) == 0 &&
                            !internal)
                        {

-                               if (buildfname(pw->pw_gecos, e->e_from.q_user, buf) &&
-                                       hvalue("MIME-Version", e) == NULL)
-                                               addheader("MIME-Version", "1.0", e);
+                               buildfname(pw->pw_gecos, e->e_from.q_user, buf);

                                if (buf[0] != '\0')
                                        FullName = newstr(buf);
                        }
                                if (buf[0] != '\0')
                                        FullName = newstr(buf);
                        }


@@ -696,7 +722,12 @@ setsender(from, e, delimptr, internal)
        else if (!internal && OpMode != MD_DAEMON)
        {
                if (e->e_from.q_home == NULL)
        else if (!internal && OpMode != MD_DAEMON)
        {
                if (e->e_from.q_home == NULL)

+               {

                        e->e_from.q_home = getenv("HOME");
                        e->e_from.q_home = getenv("HOME");

+                       if (e->e_from.q_home != NULL &&
+                           strcmp(e->e_from.q_home, "/") == 0)
+                               e->e_from.q_home++;
+               }

                e->e_from.q_uid = RealUid;
                e->e_from.q_gid = RealGid;
                e->e_from.q_flags |= QGOODUID;
                e->e_from.q_uid = RealUid;
                e->e_from.q_gid = RealGid;
                e->e_from.q_flags |= QGOODUID;


@@ -733,7 +764,7 @@ setsender(from, e, delimptr, internal)
        define('f', e->e_sender, e);
 
        /* save the domain spec if this mailer wants it */
        define('f', e->e_sender, e);
 
        /* save the domain spec if this mailer wants it */

-       if (!internal && e->e_from.q_mailer != NULL &&
+       if (e->e_from.q_mailer != NULL &&

            bitnset(M_CANONICAL, e->e_from.q_mailer->m_flags))
        {
                extern char **copyplist();
            bitnset(M_CANONICAL, e->e_from.q_mailer->m_flags))
        {
                extern char **copyplist();