From: Alejandro Colomar <alx@kernel.org>
Date: Thu, 4 Jul 2024 12:35:24 +0000 (+0200)
Subject: src/login_nopam.c: login_access(): Use stpsep() to simplify
X-Git-Tag: 4.17.0-rc1~124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=568d26d7ed1f0f033d244910ab66f7b66d19b893;p=thirdparty%2Fshadow.git

src/login_nopam.c: login_access(): Use stpsep() to simplify

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

diff --git a/src/login_nopam.c b/src/login_nopam.c
index 2b19d1515..5c0ecc0e8 100644
--- a/src/login_nopam.c
+++ b/src/login_nopam.c
@@ -104,7 +104,7 @@ int login_access (const char *user, const char *from)
 		while (   !match
 		       && (fgets (line, sizeof (line), fp) == line)) {
 			lineno++;
-			if (line[0] == '\0' || strchr(line, '\n') == NULL) {
+			if (stpsep(line, "\n") == NULL) {
 				SYSLOG ((LOG_ERR,
 					 "%s: line %d: missing newline or line too long",
 					 TABLE, lineno));
@@ -113,7 +113,7 @@ int login_access (const char *user, const char *from)
 			if (line[0] == '#') {
 				continue;	/* comment line */
 			}
-			stpcpy(strrspn(line, " \t\n"), "");
+			stpcpy(strrspn(line, " \t"), "");
 			if (line[0] == '\0') {	/* skip blank lines */
 				continue;
 			}