sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

s3:auth Change winbindd -> auth interface to more standard structures

Browse Source 
This removes conversions to and from the source3 varient of the
server_info structure when replaced in s3compat, and presents a tidier
interface to winbindd in any case.

Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>
This commit is contained in:
Andrew Bartlett
2010-05-17 19:04:31 +10:00
parent b1b9752506
commit 70211ea6a3
3 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source3/auth/check_samsec.c
View File

@ -509,3 +509,40 @@ done:
data_blob_free(&lm_sess_key);
return nt_status;
}
/* This helper function for winbindd returns a very similar value to
* what a NETLOGON call would give, without the indirection */
NTSTATUS check_sam_security_info3(const DATA_BLOB *challenge,
TALLOC_CTX *mem_ctx,
const struct auth_usersupplied_info *user_info,
struct netr_SamInfo3 **pinfo3)
{
struct auth_serversupplied_info *server_info = NULL;
struct netr_SamInfo3 *info3;
NTSTATUS status;
TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
if (!tmp_ctx) {
return NT_STATUS_NO_MEMORY;
}
status = check_sam_security(challenge, tmp_ctx, user_info, &server_info);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("check_sam_security failed: %s\n",
nt_errstr(status)));
return status;
}
info3 = TALLOC_ZERO_P(mem_ctx, struct netr_SamInfo3);
if (info3 == NULL) {
talloc_free(tmp_ctx);
return NT_STATUS_NO_MEMORY;
}
status = serverinfo_to_SamInfo3(server_info, NULL, 0, info3);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("serverinfo_to_SamInfo3 failed: %s\n",
nt_errstr(status)));
return status;
}
*pinfo3 = info3;
return NT_STATUS_OK;
}

4
source3/include/proto.h
View File

@ -66,6 +66,10 @@ NTSTATUS check_sam_security(const DATA_BLOB *challenge,
TALLOC_CTX *mem_ctx,
const struct auth_usersupplied_info *user_info,
struct auth_serversupplied_info **server_info);
NTSTATUS check_sam_security_info3(const DATA_BLOB *challenge,
TALLOC_CTX *mem_ctx,
const struct auth_usersupplied_info *user_info,
struct netr_SamInfo3 **pinfo3);
NTSTATUS auth_sam_init(void);
/* The following definitions come from auth/auth_server.c */

29
source3/winbindd/winbindd_pam.c
View File

@ -1133,8 +1133,6 @@ static NTSTATUS winbindd_dual_auth_passdb(TALLOC_CTX *mem_ctx,
struct netr_SamInfo3 **pinfo3)
{
struct auth_usersupplied_info *user_info = NULL;
struct auth_serversupplied_info *server_info = NULL;
struct netr_SamInfo3 *info3;
NTSTATUS status;
status = make_user_info(&user_info, user, user, domain, domain,
@ -1145,30 +1143,13 @@ static NTSTATUS winbindd_dual_auth_passdb(TALLOC_CTX *mem_ctx,
return status;
}
status = check_sam_security(challenge, talloc_tos(), user_info,
&server_info);
/* We don't want any more mapping of the username */
user_info->mapped_state = True;
status = check_sam_security_info3(challenge, talloc_tos(), user_info,
pinfo3);
free_user_info(&user_info);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("check_ntlm_password failed: %s\n",
nt_errstr(status)));
return status;
}
info3 = TALLOC_ZERO_P(mem_ctx, struct netr_SamInfo3);
if (info3 == NULL) {
return NT_STATUS_NO_MEMORY;
}
status = serverinfo_to_SamInfo3(server_info, NULL, 0, info3);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("serverinfo_to_SamInfo3 failed: %s\n",
nt_errstr(status)));
return status;
}
DEBUG(10, ("Authenticated user %s\\%s successfully\n", domain, user));
*pinfo3 = info3;
return NT_STATUS_OK;
}