From 00c25a5080be89ad41195969dd7fc9521a26ad7d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 28 Jan 2017 11:36:11 +0000 Subject: [PATCH] cli_netlogon: Add return parms to rpccli_netlogon_password_logon Just for symmetry with rpccli_netlogon_network_logon() Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- source3/rpc_client/cli_netlogon.c | 8 ++++---- source3/rpc_client/cli_netlogon.h | 2 ++ source3/rpcclient/cmd_netlogon.c | 4 ++++ source3/winbindd/winbindd_pam.c | 2 ++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c index d166629d4ac..634c78bfe45 100644 --- a/source3/rpc_client/cli_netlogon.c +++ b/source3/rpc_client/cli_netlogon.c @@ -310,6 +310,8 @@ NTSTATUS rpccli_netlogon_password_logon(struct netlogon_creds_cli_context *creds const char *password, const char *workstation, enum netr_LogonInfoClass logon_type, + uint8_t *authoritative, + uint32_t *flags, struct netr_SamInfo3 **info3) { TALLOC_CTX *frame = talloc_stackframe(); @@ -317,8 +319,6 @@ NTSTATUS rpccli_netlogon_password_logon(struct netlogon_creds_cli_context *creds union netr_LogonLevel *logon; uint16_t validation_level = 0; union netr_Validation *validation = NULL; - uint8_t authoritative = 0; - uint32_t flags = 0; char *workstation_slash = NULL; logon = talloc_zero(frame, union netr_LogonLevel); @@ -426,8 +426,8 @@ NTSTATUS rpccli_netlogon_password_logon(struct netlogon_creds_cli_context *creds frame, &validation_level, &validation, - &authoritative, - &flags); + authoritative, + flags); if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(frame); return status; diff --git a/source3/rpc_client/cli_netlogon.h b/source3/rpc_client/cli_netlogon.h index d63805bce7d..bef0def947d 100644 --- a/source3/rpc_client/cli_netlogon.h +++ b/source3/rpc_client/cli_netlogon.h @@ -65,6 +65,8 @@ NTSTATUS rpccli_netlogon_password_logon(struct netlogon_creds_cli_context *creds const char *password, const char *workstation, enum netr_LogonInfoClass logon_type, + uint8_t *authoritative, + uint32_t *flags, struct netr_SamInfo3 **info3); NTSTATUS rpccli_netlogon_network_logon(struct netlogon_creds_cli_context *creds, struct dcerpc_binding_handle *binding_handle, diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c index f65717287f4..29d3096ecd2 100644 --- a/source3/rpcclient/cmd_netlogon.c +++ b/source3/rpcclient/cmd_netlogon.c @@ -779,6 +779,8 @@ static NTSTATUS cmd_netlogon_sam_logon(struct rpc_pipe_client *cli, uint32_t logon_param = 0; const char *workstation = NULL; struct netr_SamInfo3 *info3 = NULL; + uint8_t authoritative = 0; + uint32_t flags = 0; /* Check arguments */ @@ -816,6 +818,8 @@ static NTSTATUS cmd_netlogon_sam_logon(struct rpc_pipe_client *cli, password, workstation, logon_type, + &authoritative, + &flags, &info3); if (!NT_STATUS_IS_OK(result)) goto done; diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 74afdcc75a4..3954de24253 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -1392,6 +1392,8 @@ static NTSTATUS winbind_samlogon_retry_loop(struct winbindd_domain *domain, password, workstation, NetlogonInteractiveInformation, + &authoritative, + &flags, info3); } else { result = rpccli_netlogon_network_logon(domain->conn.netlogon_creds,