]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
src/sulogin.c: pw_entry(): Don't else after return
authorAlejandro Colomar <alx@kernel.org>
Wed, 17 Jan 2024 15:52:12 +0000 (16:52 +0100)
committerSerge Hallyn <serge@hallyn.com>
Thu, 18 Jan 2024 00:11:19 +0000 (18:11 -0600)
Signed-off-by: Alejandro Colomar <alx@kernel.org>
src/sulogin.c

index 95b1a48aff3c99434d38249012302af83897c70d..f6bb5f6c97f9d7fe3d22a2baf304697ae0b6e1cf 100644 (file)
@@ -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);
 }