]> xenbits.xensource.com Git - freebsd.git/commitdiff
mtree -c: Fix username logic when getlogin(3) fails.
authorbdrewery <bdrewery@FreeBSD.org>
Thu, 12 Sep 2019 18:51:59 +0000 (18:51 +0000)
committerbdrewery <bdrewery@FreeBSD.org>
Thu, 12 Sep 2019 18:51:59 +0000 (18:51 +0000)
Obtained from: NetBSD (Credit to Sascha Wildner with DragonFlyBSD)
MFC after: 2 weeks

contrib/mtree/create.c

index eb7bce180d601e5dce0f2cdf30264f7dc527f75c..dc3af7447a39187db91ba4eff902ddda49d36ed6 100644 (file)
@@ -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>";
        }