From: Eric Allman <eric@ucbvax.Berkeley.EDU>
Date: Sun, 20 Mar 1983 05:14:27 +0000 (-0800)
Subject: Fix botch of putting incorrect full names on some addresses (usually
X-Git-Tag: BSD-4_2-Snapshot-Development~2734
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/b7ef7e9c984f3cf82fbfbe3336c7bb0a280e0480?hp=47aa95b63e4d8a807e7f772eef9076b6efeb7c18

Fix botch of putting incorrect full names on some addresses (usually
UNIX-to-UNIX Copy)


SCCS-mr: usr.sbin/sendmail/src/envelope.c 147
SCCS-mr: usr.sbin/sendmail/src/version.c 147
SCCS-vsn: usr.sbin/sendmail/src/envelope.c 3.13
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.330
---

diff --git a/usr/src/usr.sbin/sendmail/src/envelope.c b/usr/src/usr.sbin/sendmail/src/envelope.c
index 92ad44a864..f6c145f41c 100644
--- a/usr/src/usr.sbin/sendmail/src/envelope.c
+++ b/usr/src/usr.sbin/sendmail/src/envelope.c
@@ -3,7 +3,7 @@
 #include "sendmail.h"
 #include <sys/stat.h>
 
-SCCSID(@(#)envelope.c	3.12		%G%);
+SCCSID(@(#)envelope.c	3.13		%G%);
 
 /*
 **  NEWENVELOPE -- allocate a new envelope
@@ -575,6 +575,8 @@ setsender(from)
 			/* syserr("%s, you cannot use the -f flag", realname); */
 			from = NULL;
 		}
+		else if (strcmp(from, realname) != 0)
+			pw = NULL;
 	}
 
 	SuprErrs = TRUE;
diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index c7cc4a5f19..3d64395c8e 100644
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,5 +1,5 @@
 # ifndef lint
-static char	SccsId[] = "@(#)SendMail version 3.329 of %G%";
+static char	SccsId[] = "@(#)SendMail version 3.330 of %G%";
 # endif lint
 
-char	Version[] = "3.329";
+char	Version[] = "3.330";