From: Alejandro Colomar <alx@kernel.org>
Date: Sun, 30 Jul 2023 16:48:36 +0000 (+0200)
Subject: Use ZUSTR2STP() instead of its pattern
X-Git-Tag: 4.15.0-rc1~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1b5c46668385e8021e2b1faf569b1bea27e769a;p=thirdparty%2Fshadow.git

Use ZUSTR2STP() instead of its pattern

Cc: Christian Göttsche <cgzones@googlemail.com>
Cc: Serge Hallyn <serge@hallyn.com>
Cc: Iker Pedrosa <ipedrosa@redhat.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/utmp.c b/lib/utmp.c
index f202abe32..aa837ffb5 100644
--- a/lib/utmp.c
+++ b/lib/utmp.c
@@ -246,7 +246,7 @@ static
 	} else if (   (NULL != ut)
 	           && ('\0' != ut->ut_host[0])) {
 		hostname = XMALLOC(SIZEOF_ARRAY(ut->ut_host) + 1, char);
-		zustr2stp(hostname, ut->ut_host, SIZEOF_ARRAY(ut->ut_host));
+		ZUSTR2STP(hostname, ut->ut_host);
 #endif				/* HAVE_STRUCT_UTMP_UT_HOST */
 	}
 
diff --git a/src/logoutd.c b/src/logoutd.c
index 2612a178b..8906ad119 100644
--- a/src/logoutd.c
+++ b/src/logoutd.c
@@ -46,7 +46,7 @@ static int check_login (const struct utmp *ut)
 	char user[sizeof (ut->ut_user) + 1];
 	time_t now;
 
-	zustr2stp(user, ut->ut_user, SIZEOF_ARRAY(ut->ut_user));
+	ZUSTR2STP(user, ut->ut_user);
 
 	(void) time (&now);
 
@@ -224,7 +224,7 @@ int main (int argc, char **argv)
 				kill (-ut->ut_pid, SIGKILL);
 			}
 
-			zustr2stp(user, ut->ut_user, SIZEOF_ARRAY(ut->ut_user));
+			ZUSTR2STP(user, ut->ut_user);
 
 			SYSLOG ((LOG_NOTICE,
 				 "logged off user '%s' on '%s'", user,