diff options
| author | Andreas Schneider <asn@samba.org> | 2010-07-29 13:16:09 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2010-08-16 12:48:27 +0200 |
| commit | 66b6a8cf62c2fe9b1eafeb094916e6046f686359 (patch) | |
| tree | f7ea7068a1a6d63ccefc804128d7cd640bf03ec4 /source3/auth/pass_check.c | |
| parent | f03ac22770ef96d4b0fec81d94efefcddd8b310b (diff) | |
| download | samba-66b6a8cf62c2fe9b1eafeb094916e6046f686359.tar.gz samba-66b6a8cf62c2fe9b1eafeb094916e6046f686359.tar.bz2 samba-66b6a8cf62c2fe9b1eafeb094916e6046f686359.zip | |
s3-auth: Remove obsolete 'update encrypted' option.
Diffstat (limited to 'source3/auth/pass_check.c')
| -rw-r--r-- | source3/auth/pass_check.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/source3/auth/pass_check.c b/source3/auth/pass_check.c index d1b720c922..ee35fba5f4 100644 --- a/source3/auth/pass_check.c +++ b/source3/auth/pass_check.c @@ -647,8 +647,10 @@ match is found and is used to update the encrypted password file return NT_STATUS_OK on correct match, appropriate error otherwise ****************************************************************************/ -NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *password, - bool (*fn) (const char *, const char *), bool run_cracker) +NTSTATUS pass_check(const struct passwd *pass, + const char *user, + const char *password, + bool run_cracker) { char *pass2 = NULL; int level = lp_passwordlevel(); @@ -820,9 +822,6 @@ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *pas /* try it as it came to us */ nt_status = password_check(password); if NT_STATUS_IS_OK(nt_status) { - if (fn) { - fn(user, password); - } return (nt_status); } else if (!NT_STATUS_EQUAL(nt_status, NT_STATUS_WRONG_PASSWORD)) { /* No point continuing if its not the password thats to blame (ie PAM disabled). */ @@ -850,8 +849,6 @@ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *pas if (strhasupper(pass2)) { strlower_m(pass2); if NT_STATUS_IS_OK(nt_status = password_check(pass2)) { - if (fn) - fn(user, pass2); return (nt_status); } } @@ -865,8 +862,6 @@ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *pas strlower_m(pass2); if (NT_STATUS_IS_OK(nt_status = string_combinations(pass2, password_check, level))) { - if (fn) - fn(user, pass2); return nt_status; } |