diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-18 18:16:24 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-19 11:54:36 +0200 |
| commit | ba706d696b8fb14b8d449cd198d982eef18e4320 (patch) | |
| tree | 1763bbe11f5345a9998946e25f67b5998167b8b2 /source3/auth/auth_domain.c | |
| parent | 89899f55dc1fb137a0adfd734c87b65039f598a4 (diff) | |
| download | samba-ba706d696b8fb14b8d449cd198d982eef18e4320.tar.gz samba-ba706d696b8fb14b8d449cd198d982eef18e4320.tar.bz2 samba-ba706d696b8fb14b8d449cd198d982eef18e4320.zip | |
s3: Remove smb_pam_accountcheck from the auth modules
We go through the same check in auth/auth.c line 287 after the module has done
its job. So we don't have to do that check twice.
Diffstat (limited to 'source3/auth/auth_domain.c')
| -rw-r--r-- | source3/auth/auth_domain.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c index 445aff51bb..cac482c3d0 100644 --- a/source3/auth/auth_domain.c +++ b/source3/auth/auth_domain.c @@ -342,22 +342,9 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx, if (NT_STATUS_IS_OK(nt_status)) { (*server_info)->nss_token |= user_info->was_mapped; - - if ( ! (*server_info)->guest) { - /* if a real user check pam account restrictions */ - /* only really perfomed if "obey pam restriction" is true */ - nt_status = smb_pam_accountcheck((*server_info)->unix_name); - if ( !NT_STATUS_IS_OK(nt_status)) { - DEBUG(1, ("PAM account restriction prevents user login\n")); - cli_shutdown(cli); - TALLOC_FREE(info3); - return nt_status; - } - } + netsamlogon_cache_store(user_info->client.account_name, info3); + TALLOC_FREE(info3); } - - netsamlogon_cache_store(user_info->client.account_name, info3); - TALLOC_FREE(info3); } /* Note - once the cli stream is shutdown the mem_ctx used |