from set by sendmail -- don't reset it!

SCCS-vsn: libexec/mail.local/mail.local.c 5.1

diff --git a/usr/src/libexec/mail.local/mail.local.c b/usr/src/libexec/mail.local/mail.local.c
index bd5a271..c4ef62f 100644 (file)
--- a/usr/src/libexec/mail.local/mail.local.c
+++ b/usr/src/libexec/mail.local/mail.local.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)mail.local.c       4.38 (Berkeley) %G%";
+static char sccsid[] = "@(#)mail.local.c       5.1 (Berkeley) %G%";

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


@@ -74,8 +74,8 @@ main(argc, argv)
         * corresponding to the uid.
         */
        uid = getuid();
         * corresponding to the uid.
         */
        uid = getuid();

-       if (!from || !(from = getlogin()) ||
-           !(pw = getpwnam(from)) || pw->pw_uid != uid)
+       if (!from && (!(from = getlogin()) ||
+           !(pw = getpwnam(from)) || pw->pw_uid != uid))

                from = (pw = getpwuid(uid)) ? pw->pw_name : "???";
 
        fd = store(from);
                from = (pw = getpwuid(uid)) ? pw->pw_name : "???";
 
        fd = store(from);