From: Miika Alikirri <miika.alikirri@suse.com>
Date: Mon, 19 Feb 2024 10:09:13 +0000 (+0200)
Subject: lastlog2: Don't print space if Service column is not printed
X-Git-Tag: v2.42-start~526
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c14996da1e132830bcc024c2ca7430fe3c2ac28;p=thirdparty%2Futil-linux.git

lastlog2: Don't print space if Service column is not printed
---

diff --git a/misc-utils/lastlog2.c b/misc-utils/lastlog2.c
index 010c7e6fa..7d440fc7f 100644
--- a/misc-utils/lastlog2.c
+++ b/misc-utils/lastlog2.c
@@ -90,7 +90,8 @@ print_entry(const char *user, int64_t ll_time,
 	}
 	printf("%-16s %-8.8s %*s %s%*s%s\n", user, tty ? tty : "",
 	       -maxIPv6Addrlen, rhost ? rhost : "", datep,
-	       sflg?31-(int)strlen(datep):0, " ", sflg?(pam_service?pam_service:""):"");
+	       sflg?31-(int)strlen(datep):0, (sflg&&pam_service)?" ":"",
+	       sflg?(pam_service?pam_service:""):"");
 
 	if (error)
 		printf("\nError: %s\n", error);