sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

Use netr_SamInfo3 in remaining places.

Browse Source 
Guenther
(This used to be commit 92fca97951bf7adf8caaeabdaff21682b18dd91f)
This commit is contained in:
Günther Deschner 2008-02-17 02:09:35 +01:00
parent c25958a046
commit 7dfeae6073
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/auth/auth_domain.c
View File

@ -189,7 +189,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
struct sockaddr_storage *dc_ss)
{
NET_USER_INFO_3 info3;
struct netr_SamInfo3 *info3 = NULL;
struct cli_state *cli = NULL;
struct rpc_pipe_client *netlogon_pipe = NULL;
NTSTATUS nt_status = NT_STATUS_NO_LOGON_SERVERS;
@ -227,8 +227,6 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
saf_store( domain, cli->desthost );
ZERO_STRUCT(info3);
/*
* If this call succeeds, we now have lots of info about the user
* in the info3 structure.
@ -267,7 +265,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
user_info->smb_name,
domain,
server_info,
&info3);
info3);
if (NT_STATUS_IS_OK(nt_status)) {
if (user_info->was_mapped) {
@ -281,12 +279,14 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
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->smb_name, &info3 );
netsamlogon_cache_store(user_info->smb_name, info3);
TALLOC_FREE(info3);
}
/* Note - once the cli stream is shutdown the mem_ctx used

2
source3/passdb/passdb.c
View File

@ -206,7 +206,7 @@ static NTSTATUS samu_set_unix_internal(struct samu *user, const struct passwd *p
/* Now deal with the user SID. If we have a backend that can generate
RIDs, then do so. But sometimes the caller just wanted a structure
initialized and will fill in these fields later (such as from a
NET_USER_INFO_3 structure) */
netr_SamInfo3 structure) */
if ( create && !pdb_rid_algorithm() ) {
uint32 user_rid;

2
source3/passdb/pdb_get_set.c
View File

@ -538,7 +538,7 @@ bool pdb_set_user_sid_from_string(struct samu *sampass, fstring u_sid, enum pdb_
We never fill this in from a passdb backend but rather set is
based on the user's primary group membership. However, the
struct samu* is overloaded and reused in domain memship code
as well and built from the NET_USER_INFO_3 or PAC so we
as well and built from the netr_SamInfo3 or PAC so we
have to allow the explicitly setting of a group SID here.
********************************************************************/