sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s4:rpc_server/netlogon: make use of creds->ex->client_sid

Browse Source 
creds->sid will be removed soon...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15425

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
(cherry picked from commit 4533afc9e1)
This commit is contained in:
Stefan Metzmacher 2024-10-02 19:01:39 +02:00 committed by Jule Anger
parent 6d117ea4c8
commit 0b85452df0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source4/rpc_server/netlogon/dcerpc_netlogon.c
View File

@ -942,7 +942,7 @@ static NTSTATUS dcesrv_netr_ServerPasswordSet(struct dcesrv_call_state *dce_call
r->in.credential, r->out.return_authenticator, r->in.credential, r->out.return_authenticator,
&creds); &creds);
NT_STATUS_NOT_OK_RETURN(nt_status); NT_STATUS_NOT_OK_RETURN(nt_status);
client_sid = creds->sid; client_sid = &creds->ex->client_sid;
sam_ctx = dcesrv_samdb_connect_as_system(mem_ctx, dce_call); sam_ctx = dcesrv_samdb_connect_as_system(mem_ctx, dce_call);
if (sam_ctx == NULL) { if (sam_ctx == NULL) {
@ -988,7 +988,7 @@ static NTSTATUS dcesrv_netr_ServerPasswordSet2(struct dcesrv_call_state *dce_cal
r->in.credential, r->out.return_authenticator, r->in.credential, r->out.return_authenticator,
&creds); &creds);
NT_STATUS_NOT_OK_RETURN(nt_status); NT_STATUS_NOT_OK_RETURN(nt_status);
client_sid = creds->sid; client_sid = &creds->ex->client_sid;
sam_ctx = dcesrv_samdb_connect_as_system(mem_ctx, dce_call); sam_ctx = dcesrv_samdb_connect_as_system(mem_ctx, dce_call);
if (sam_ctx == NULL) { if (sam_ctx == NULL) {
@ -1339,7 +1339,7 @@ static NTSTATUS dcesrv_netr_LogonSamLogon_base_call(struct dcesrv_netr_LogonSamL
user_info->netlogon_trust_account.account_name user_info->netlogon_trust_account.account_name
= creds->account_name; = creds->account_name;
user_info->netlogon_trust_account.sid user_info->netlogon_trust_account.sid
= creds->sid; = &creds->ex->client_sid;
break; break;
default: default:
@ -2682,7 +2682,7 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal
talloc_free(frame); talloc_free(frame);
} }
NT_STATUS_NOT_OK_RETURN(status); NT_STATUS_NOT_OK_RETURN(status);
client_sid = creds->sid; client_sid = &creds->ex->client_sid;
/* We want to avoid connecting as system. */ /* We want to avoid connecting as system. */
sam_ctx = dcesrv_samdb_connect_as_user(mem_ctx, dce_call); sam_ctx = dcesrv_samdb_connect_as_user(mem_ctx, dce_call);
@ -3078,7 +3078,7 @@ static NTSTATUS dcesrv_netr_NetrLogonSendToSam(struct dcesrv_call_state *dce_cal
&creds); &creds);
NT_STATUS_NOT_OK_RETURN(nt_status); NT_STATUS_NOT_OK_RETURN(nt_status);
client_sid = creds->sid; client_sid = &creds->ex->client_sid;
switch (creds->secure_channel_type) { switch (creds->secure_channel_type) {
case SEC_CHAN_BDC: case SEC_CHAN_BDC:
@ -4470,7 +4470,7 @@ static NTSTATUS dcesrv_netr_ServerGetTrustInfo(struct dcesrv_call_state *dce_cal
if (!NT_STATUS_IS_OK(nt_status)) { if (!NT_STATUS_IS_OK(nt_status)) {
return nt_status; return nt_status;
} }
client_sid = creds->sid; client_sid = &creds->ex->client_sid;
/* TODO: check r->in.server_name is our name */ /* TODO: check r->in.server_name is our name */
@ -4655,7 +4655,7 @@ static NTSTATUS dcesrv_netr_DsrUpdateReadOnlyServerDnsRecords(struct dcesrv_call
r->out.return_authenticator, r->out.return_authenticator,
&creds); &creds);
NT_STATUS_NOT_OK_RETURN(nt_status); NT_STATUS_NOT_OK_RETURN(nt_status);
client_sid = creds->sid; client_sid = &creds->ex->client_sid;
if (creds->secure_channel_type != SEC_CHAN_RODC) { if (creds->secure_channel_type != SEC_CHAN_RODC) {
return NT_STATUS_ACCESS_DENIED; return NT_STATUS_ACCESS_DENIED;