From: Alejandro Colomar <alx@kernel.org>
Date: Sat, 18 May 2024 20:03:08 +0000 (+0200)
Subject: src/login_nopam.c: login_access(): Simplify, calling strchr(3)
X-Git-Tag: 4.17.0-rc1~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=813c3ec6c5cc0670f9b5762b17daaafe1596b385;p=thirdparty%2Fshadow.git

src/login_nopam.c: login_access(): Simplify, calling strchr(3)

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/src/login_nopam.c b/src/login_nopam.c
index e6f77d1cc..1a2b17367 100644
--- a/src/login_nopam.c
+++ b/src/login_nopam.c
@@ -100,10 +100,8 @@ int login_access (const char *user, const char *from)
 		int lineno = 0;	/* for diagnostics */
 		while (   !match
 		       && (fgets (line, sizeof (line), fp) == line)) {
-			ptrdiff_t  end;
 			lineno++;
-			end = strlen (line) - 1;
-			if (line[0] == '\0' || line[end] != '\n') {
+			if (line[0] == '\0' || strchr(line, '\n') == NULL) {
 				SYSLOG ((LOG_ERR,
 					 "%s: line %d: missing newline or line too long",
 					 TABLE, lineno));