From: bdrewery <bdrewery@FreeBSD.org>
Date: Thu, 12 Sep 2019 18:51:59 +0000 (+0000)
Subject: mtree -c: Fix username logic when getlogin(3) fails.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5abaf1af203e7871a08fc24d0f4ff84b2bad39a3;p=freebsd.git

mtree -c: Fix username logic when getlogin(3) fails.

Obtained from:	NetBSD (Credit to Sascha Wildner with DragonFlyBSD)
MFC after:	2 weeks
---

diff --git a/contrib/mtree/create.c b/contrib/mtree/create.c
index eb7bce180d6..dc3af7447a3 100644
--- a/contrib/mtree/create.c
+++ b/contrib/mtree/create.c
@@ -117,7 +117,7 @@ cwalk(FILE *fp)
 	host[sizeof(host) - 1] = '\0';
 	if ((user = getlogin()) == NULL) {
 		struct passwd *pw;
-		user = (pw = getpwuid(getuid())) == NULL ? pw->pw_name :
+		user = (pw = getpwuid(getuid())) != NULL ? pw->pw_name :
 		    "<unknown>";
 	}