diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-06-01 21:52:01 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-08-14 11:58:13 +1000 |
| commit | 23994e1b53b8528007f6325ce5f286712ec021be (patch) | |
| tree | c0e69e1401576756560bf71b73c3725312b7d866 /source3/auth/pass_check.c | |
| parent | 272e49e85c47d88ef0a84bce88e6f8d984f2eae4 (diff) | |
| download | samba-23994e1b53b8528007f6325ce5f286712ec021be.tar.gz samba-23994e1b53b8528007f6325ce5f286712ec021be.tar.bz2 samba-23994e1b53b8528007f6325ce5f286712ec021be.zip | |
s3:auth Make Samba3 use the new common struct auth_usersupplied_info
This common structure will make it much easier to produce an auth
module for s3compat that calls Samba4's auth subsystem.
In order the make the link work properly (and not map twice), we mark
both that we did try and map the user, as well as if we changed the
user during the mapping.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/auth/pass_check.c')
| -rw-r--r-- | source3/auth/pass_check.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/auth/pass_check.c b/source3/auth/pass_check.c index 813540d9fa..d1b720c922 100644 --- a/source3/auth/pass_check.c +++ b/source3/auth/pass_check.c @@ -648,7 +648,7 @@ return NT_STATUS_OK on correct match, appropriate error otherwise ****************************************************************************/ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *password, - int pwlen, bool (*fn) (const char *, const char *), bool run_cracker) + bool (*fn) (const char *, const char *), bool run_cracker) { char *pass2 = NULL; int level = lp_passwordlevel(); @@ -662,7 +662,7 @@ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *pas if (!password) return NT_STATUS_LOGON_FAILURE; - if (((!*password) || (!pwlen)) && !lp_null_passwords()) + if ((!*password) && !lp_null_passwords()) return NT_STATUS_LOGON_FAILURE; #if defined(WITH_PAM) @@ -676,11 +676,11 @@ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *pas return NT_STATUS_NO_MEMORY; } - DEBUG(4, ("pass_check: Checking (PAM) password for user %s (l=%d)\n", user, pwlen)); + DEBUG(4, ("pass_check: Checking (PAM) password for user %s\n", user)); #else /* Not using PAM */ - DEBUG(4, ("pass_check: Checking password for user %s (l=%d)\n", user, pwlen)); + DEBUG(4, ("pass_check: Checking password for user %s\n", user)); if (!pass) { DEBUG(3, ("Couldn't find user %s\n", user)); |