diff options
| author | walter harms <wharms@bfs.de> | 2012-09-04 12:26:20 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-09-04 12:26:20 +0200 |
| commit | d1d794fd4878834324602ae12ad7af73064683a9 (patch) | |
| tree | 75fbd372eb75cdd66d698bdd057c7e841d02056b | |
| parent | 9b80b903c7fd2120a72de287fe6b0920e6d3c8ff (diff) | |
| download | busybox-d1d794fd4878834324602ae12ad7af73064683a9.tar.gz | |
refactor correct_password.c to avoid one if
Signed-off-by: walter harms <wharms@bfs.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | libbb/correct_password.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libbb/correct_password.c b/libbb/correct_password.c index 6301589e6..7cabd33d0 100644 --- a/libbb/correct_password.c +++ b/libbb/correct_password.c @@ -41,12 +41,6 @@ int FAST_FUNC correct_password(const struct passwd *pw) char *unencrypted, *encrypted; const char *correct; int r; -#if ENABLE_FEATURE_SHADOWPASSWDS - /* Using _r function to avoid pulling in static buffers */ - struct spwd spw; - char buffer[256]; -#endif - /* fake salt. crypt() can choke otherwise. */ correct = "aa"; if (!pw) { @@ -55,7 +49,10 @@ int FAST_FUNC correct_password(const struct passwd *pw) } correct = pw->pw_passwd; #if ENABLE_FEATURE_SHADOWPASSWDS + /* Using _r function to avoid pulling in static buffers */ if ((correct[0] == 'x' || correct[0] == '*') && !correct[1]) { + struct spwd spw; + char buffer[256]; /* getspnam_r may return 0 yet set result to NULL. * At least glibc 2.4 does this. Be extra paranoid here. */ struct spwd *result = NULL; |