2 files changed, 7 insertions, 4 deletions

diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index bcb7f2b26..0d910f56a 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -275,7 +275,8 @@ int passwd_main(int argc, char **argv)
         }
 
         filename = bb_path_passwd_file;
-        if (ENABLE_FEATURE_SHADOWPASSWDS) {
+#if ENABLE_FEATURE_SHADOWPASSWDS
+        {
                 struct spwd *sp = getspnam(name);
                 if (!sp) {
                         /* LOGMODE_BOTH */
@@ -287,6 +288,7 @@ int passwd_main(int argc, char **argv)
                         pw->pw_passwd = sp->sp_pwdp;
                 }
         }
+#endif
 
         /* Decide what the new password will be */
         newp = NULL;
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index c07264e7b..8bcb393f5 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -41,7 +41,6 @@ int sulogin_main(int argc, char **argv)
         char *timeout_arg;
         const char * const *p;
         struct passwd *pwd;
-        struct spwd *spwd;
         const char *shell;
 
         logmode = LOGMODE_BOTH;
@@ -75,13 +74,15 @@ int sulogin_main(int argc, char **argv)
                 goto auth_error;
         }
 
-        if (ENABLE_FEATURE_SHADOWPASSWDS) {
-                spwd = getspnam(pwd->pw_name);
+#if ENABLE_FEATURE_SHADOWPASSWDS
+        {
+                struct spwd *spwd = getspnam(pwd->pw_name);
                 if (!spwd) {
                         goto auth_error;
                 }
                 pwd->pw_passwd = spwd->sp_pwdp;
         }
+#endif
 
         while (1) {
                 /* cp points to a static buffer that is zeroed every time */