From: Alejandro Colomar <alx@kernel.org>
Date: Wed, 17 Jan 2024 15:52:12 +0000 (+0100)
Subject: src/sulogin.c: pw_entry(): Don't else after return
X-Git-Tag: 4.15.0-rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5214710432f531ffde8763e44ce9355bbdb58768;p=thirdparty%2Fshadow.git

src/sulogin.c: pw_entry(): Don't else after return

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

diff --git a/src/sulogin.c b/src/sulogin.c
index 95b1a48af..f6bb5f6c9 100644
--- a/src/sulogin.c
+++ b/src/sulogin.c
@@ -197,23 +197,23 @@ pw_entry(const char *name, struct passwd *pwent)
 
 	struct spwd *spwd;
 
-	if (!(passwd = getpwnam (name))) { /* local, no need for xgetpwnam */
+	if (!(passwd = getpwnam(name))) {  /* local, no need for xgetpwnam */
 		pwent->pw_name = NULL;
 		return;
-	} else {
-		pwent->pw_name = xstrdup (passwd->pw_name);
-		pwent->pw_uid = passwd->pw_uid;
-		pwent->pw_gid = passwd->pw_gid;
-		pwent->pw_gecos = xstrdup (passwd->pw_gecos);
-		pwent->pw_dir = xstrdup (passwd->pw_dir);
-		pwent->pw_shell = xstrdup (passwd->pw_shell);
+	}
+
+	pwent->pw_name = xstrdup(passwd->pw_name);
+	pwent->pw_uid = passwd->pw_uid;
+	pwent->pw_gid = passwd->pw_gid;
+	pwent->pw_gecos = xstrdup(passwd->pw_gecos);
+	pwent->pw_dir = xstrdup(passwd->pw_dir);
+	pwent->pw_shell = xstrdup(passwd->pw_shell);
 #if !defined(AUTOSHADOW)
-		/* local, no need for xgetspnam */
-		if ((spwd = getspnam (name))) {
-			pwent->pw_passwd = xstrdup (spwd->sp_pwdp);
-			return;
-		}
-#endif
-		pwent->pw_passwd = xstrdup (passwd->pw_passwd);
+	/* local, no need for xgetspnam */
+	if ((spwd = getspnam(name))) {
+		pwent->pw_passwd = xstrdup(spwd->sp_pwdp);
+		return;
 	}
+#endif
+	pwent->pw_passwd = xstrdup(passwd->pw_passwd);
 }