Simplify a bit pw_check()

This commit is contained in:
sin 2014-06-09 12:53:15 +01:00
parent 1b6fab85d6
commit 78192e87d9
1 changed files with 3 additions and 9 deletions

View File

@ -17,11 +17,8 @@ pw_check(struct passwd *pw, const char *pass)
struct spwd *spw;
p = pw->pw_passwd;
switch (pw->pw_passwd[0]) {
case '!':
case '*':
if (p[0] == '!' || p[0] == '*')
eprintf("denied\n");
}
if (pw->pw_passwd[0] == '\0')
return pass[0] == '\0' ? 1 : 0;
@ -33,12 +30,9 @@ pw_check(struct passwd *pw, const char *pass)
eprintf("getspnam: %:", pw->pw_name);
else if (!spw)
eprintf("who are you?\n");
switch (spw->sp_pwdp[0]) {
case '!':
case '*':
eprintf("denied\n");
}
p = spw->sp_pwdp;
if (p[0] == '!' || p[0] == '*')
eprintf("denied\n");
}
cryptpass = crypt(pass, p);