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 92ad44a..f6c145f 100644 (file)
--- 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>
 
 #include "sendmail.h"
 #include <sys/stat.h>
 

-SCCSID(@(#)envelope.c  3.12            %G%);
+SCCSID(@(#)envelope.c  3.13            %G%);

 
 /*
 **  NEWENVELOPE -- allocate a new envelope
 
 /*
 **  NEWENVELOPE -- allocate a new envelope


@@ -575,6 +575,8 @@ setsender(from)
                        /* syserr("%s, you cannot use the -f flag", realname); */
                        from = NULL;
                }
                        /* syserr("%s, you cannot use the -f flag", realname); */
                        from = NULL;
                }

+               else if (strcmp(from, realname) != 0)
+                       pw = NULL;

        }
 
        SuprErrs = TRUE;
        }
 
        SuprErrs = TRUE;

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index c7cc4a5..3d64395 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,5 +1,5 @@
 # ifndef lint
 # ifndef lint

-static char    SccsId[] = "@(#)SendMail version 3.329 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.330 of %G%";

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.329";
+char   Version[] = "3.330";