From 5abaf1af203e7871a08fc24d0f4ff84b2bad39a3 Mon Sep 17 00:00:00 2001 From: bdrewery Date: Thu, 12 Sep 2019 18:51:59 +0000 Subject: [PATCH] mtree -c: Fix username logic when getlogin(3) fails. Obtained from: NetBSD (Credit to Sascha Wildner with DragonFlyBSD) MFC after: 2 weeks --- contrib/mtree/create.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 : ""; } -- 2.39.5