summaryrefslogtreecommitdiff
path: root/source3/auth
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-07-05 08:05:06 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-07-05 08:05:06 +0000
commitd809ad1d1999b097ff30952b9d14cf5aaa72562e (patch)
treeb2124b79d9a23301160dd1755f5a5949af15350b /source3/auth
parent94a609189314ae888ee9783fd1933054d359f712 (diff)
downloadsamba-d809ad1d1999b097ff30952b9d14cf5aaa72562e.tar.gz
samba-d809ad1d1999b097ff30952b9d14cf5aaa72562e.tar.bz2
samba-d809ad1d1999b097ff30952b9d14cf5aaa72562e.zip
PAM should operate on the Unix username, not the NT username (which might not
have the domain\ qualification). Andrew Bartlett (This used to be commit 7cfa1e7c4abee10fe8c75e36aee68ee9f557656e)
Diffstat (limited to 'source3/auth')
-rw-r--r--source3/auth/auth.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index 9f109dc66e..a2486acbd1 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -205,7 +205,7 @@ static NTSTATUS check_ntlm_password(const struct auth_context *auth_context,
{
/* if all the modules say 'not for me' this is reasonable */
NTSTATUS nt_status = NT_STATUS_NO_SUCH_USER;
- const char *pdb_username;
+ const char *unix_username;
auth_methods *auth_method;
TALLOC_CTX *mem_ctx;
@@ -277,19 +277,19 @@ static NTSTATUS check_ntlm_password(const struct auth_context *auth_context,
}
if (NT_STATUS_IS_OK(nt_status)) {
- pdb_username = pdb_get_username((*server_info)->sam_account);
+ unix_username = (*server_info)->unix_name;
if (!(*server_info)->guest) {
/* We might not be root if we are an RPC call */
become_root();
- nt_status = smb_pam_accountcheck(pdb_username);
+ nt_status = smb_pam_accountcheck(unix_username);
unbecome_root();
if (NT_STATUS_IS_OK(nt_status)) {
DEBUG(5, ("check_ntlm_password: PAM Account for user [%s] succeeded\n",
- pdb_username));
+ unix_username));
} else {
DEBUG(3, ("check_ntlm_password: PAM Account for user [%s] FAILED with error %s\n",
- pdb_username, nt_errstr(nt_status)));
+ unix_username, nt_errstr(nt_status)));
}
}
@@ -299,7 +299,7 @@ static NTSTATUS check_ntlm_password(const struct auth_context *auth_context,
(*server_info)->guest ? "guest " : "",
user_info->smb_name.str,
user_info->internal_username.str,
- pdb_username));
+ unix_username));
}
}