aboutsummaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-12-30 14:46:51 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-12-30 14:46:51 +0000
commitb5a122b6f9643fb052d31390e435397960289154 (patch)
treea6e22557206650da7a44300823621cbb17c86293 /loginutils
parentd9e4ddc38b38b7cf6cc7bdd9dcf6794f8aad8d2e (diff)
downloadbusybox-w32-b5a122b6f9643fb052d31390e435397960289154.tar.gz
busybox-w32-b5a122b6f9643fb052d31390e435397960289154.tar.bz2
busybox-w32-b5a122b6f9643fb052d31390e435397960289154.zip
fix for uclibc-without-shadow.h compilation
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/passwd.c4
-rw-r--r--loginutils/sulogin.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index c825c978f..5c822b190 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -276,7 +276,8 @@ int passwd_main(int argc, char **argv)
276 } 276 }
277 277
278 filename = bb_path_passwd_file; 278 filename = bb_path_passwd_file;
279 if (ENABLE_FEATURE_SHADOWPASSWDS) { 279#if ENABLE_FEATURE_SHADOWPASSWDS
280 {
280 struct spwd *sp = getspnam(name); 281 struct spwd *sp = getspnam(name);
281 if (!sp) { 282 if (!sp) {
282 /* LOGMODE_BOTH */ 283 /* LOGMODE_BOTH */
@@ -288,6 +289,7 @@ int passwd_main(int argc, char **argv)
288 pw->pw_passwd = sp->sp_pwdp; 289 pw->pw_passwd = sp->sp_pwdp;
289 } 290 }
290 } 291 }
292#endif
291 293
292 /* Decide what the new password will be */ 294 /* Decide what the new password will be */
293 newp = NULL; 295 newp = NULL;
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index 30f9d9350..8bcb393f5 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -74,13 +74,15 @@ int sulogin_main(int argc, char **argv)
74 goto auth_error; 74 goto auth_error;
75 } 75 }
76 76
77 if (ENABLE_FEATURE_SHADOWPASSWDS) { 77#if ENABLE_FEATURE_SHADOWPASSWDS
78 {
78 struct spwd *spwd = getspnam(pwd->pw_name); 79 struct spwd *spwd = getspnam(pwd->pw_name);
79 if (!spwd) { 80 if (!spwd) {
80 goto auth_error; 81 goto auth_error;
81 } 82 }
82 pwd->pw_passwd = spwd->sp_pwdp; 83 pwd->pw_passwd = spwd->sp_pwdp;
83 } 84 }
85#endif
84 86
85 while (1) { 87 while (1) {
86 /* cp points to a static buffer that is zeroed every time */ 88 /* cp points to a static buffer that is zeroed every time */