diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2002-01-19 03:18:33 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2002-01-19 03:18:33 +0000 |
| commit | 50356ef361abdf95168f3da545b4027c862f49e9 (patch) | |
| tree | 5b814730673fd53306aa5a74c91027c23850e269 /libexec | |
| parent | d54c36388e53b0a37541e91862d4ab9d096c4a71 (diff) | |
Notes
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/ftpd.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index e421142f2716..15dcd20750d2 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1252,23 +1252,21 @@ pass(passwd) #ifdef USE_PAM rval = auth_pam(&pw, passwd); opieunlock(); /* XXX */ - if (rval == 0 || (!pwok && rval > 0)) + if (rval >= 0) goto skip; - xpasswd = crypt(passwd, pw->pw_passwd); -#else /* !USE_PAM */ +#endif if (opieverify(&opiedata, passwd) == 0) xpasswd = pw->pw_passwd; - else if (pwok) + else if (pwok) { xpasswd = crypt(passwd, pw->pw_passwd); - else { + if (passwd[0] == '\0' && pw->pw_passwd[0] != '\0') + xpasswd = ":"; + } else { rval = 1; goto skip; } -#endif /* !USE_PAM */ rval = strcmp(pw->pw_passwd, xpasswd); - /* The strcmp does not catch null passwords! */ - if (*pw->pw_passwd == '\0' || - (pw->pw_expire && time(NULL) >= pw->pw_expire)) + if (pw->pw_expire && time(NULL) >= pw->pw_expire) rval = 1; /* failure */ skip: /* |