Make sure getpwuid returns a valid entry before setting myname.

SCCS-vsn: usr.sbin/sendmail/src/conf.c 5.4

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 9b1c971..9300338 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -9,7 +9,7 @@
 */
 
 #ifndef lint
 */
 
 #ifndef lint

-static char    SccsId[] = "@(#)conf.c  5.3 (Berkeley) %G%";
+static char    SccsId[] = "@(#)conf.c  5.4 (Berkeley) %G%";

 #endif not lint
 
 # include <pwd.h>
 #endif not lint
 
 # include <pwd.h>


@@ -346,7 +346,8 @@ username()
                        if(getuid() != pw->pw_uid)
                        {
                                pw = getpwuid(getuid());
                        if(getuid() != pw->pw_uid)
                        {
                                pw = getpwuid(getuid());

-                               myname = pw->pw_name;
+                               if (pw != NULL)
+                                       myname = pw->pw_name;

                        }
                }
                if (myname == NULL || myname[0] == '\0')
                        }
                }
                if (myname == NULL || myname[0] == '\0')