s4 rpc netlogon: Pass logon_id to auth logging

[nivanova/samba-autobuild/.git] / source4 / rpc_server / netlogon / dcerpc_netlogon.c

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 530350d442acc67575fa29b7d14f6dec7a3f5f93..0bb350aa9a8c2a475f8f3a89577f7a31e618be4a 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -1056,6 +1056,9 @@ static NTSTATUS dcesrv_netr_LogonSamLogon_base_call(struct dcesrv_netr_LogonSamL
                NT_STATUS_HAVE_NO_MEMORY(user_info->password.hash.nt);
                *user_info->password.hash.nt = r->in.logon->password->ntpassword;
 
+               user_info->logon_id
+                   = r->in.logon->password->identity_info.logon_id;
+
                break;
        case NetlogonNetworkInformation:
        case NetlogonNetworkTransitiveInformation:
@@ -1080,6 +1083,9 @@ static NTSTATUS dcesrv_netr_LogonSamLogon_base_call(struct dcesrv_netr_LogonSamL
                user_info->password.response.lanman = data_blob_talloc(mem_ctx, r->in.logon->network->lm.data, r->in.logon->network->lm.length);
                user_info->password.response.nt = data_blob_talloc(mem_ctx, r->in.logon->network->nt.data, r->in.logon->network->nt.length);
 
+               user_info->logon_id
+                   = r->in.logon->network->identity_info.logon_id;
+
                nt_status = NTLMv2_RESPONSE_verify_netlogon_creds(
                                        user_info->client.account_name,
                                        user_info->client.domain_name,
@@ -1108,6 +1114,9 @@ static NTSTATUS dcesrv_netr_LogonSamLogon_base_call(struct dcesrv_netr_LogonSamL
 
                        r->out.validation->generic = generic;
 
+                       user_info->logon_id
+                           = r->in.logon->generic->identity_info.logon_id;
+
                        irpc_handle = irpc_binding_handle_by_name(mem_ctx,
                                                                  dce_call->msg_ctx,
                                                                  "kdc_server",