Attachment 5400 Details for Bug 7160 – Patch for v3-5 and master

[patch] Patch for v3-5 and master

tmp.diff (text/plain), 1.78 KB, created by Stefan Metzmacher on 2010-02-19 16:39:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2010-02-19 16:39:10 UTC

Size: 1.78 KB

patch

obsolete

>From f64ba189f95b681d2093f2ff6d39eef92cc19431 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Fri, 19 Feb 2010 23:22:40 +0100
>Subject: [PATCH] s3:cli_netlogon: keep the the correct negotiate_flags on the cli->dc structure
>
>This should fix the rpccli_netlogon_set_trust_password() against DC's
>without netr_ServerPasswordSet2 support.
>
>metze
>---
> source3/rpc_client/cli_netlogon.c |    8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
>index e484209..3c4ddc2 100644
>--- a/source3/rpc_client/cli_netlogon.c
>+++ b/source3/rpc_client/cli_netlogon.c
>@@ -45,6 +45,7 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
> 	struct samr_Password password;
> 	bool retried = false;
> 	fstring mach_acct;
>+	uint32_t neg_flags = *neg_flags_inout;
> 
> 	if (!ndr_syntax_id_equal(&cli->abstract_syntax,
> 				 &ndr_table_netlogon.syntax_id)) {
>@@ -81,7 +82,7 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
> 				    &srv_chal_recv,
> 				    &password,
> 				    &clnt_chal_send,
>-				    *neg_flags_inout);
>+				    neg_flags);
> 
> 	if (!cli->dc) {
> 		return NT_STATUS_NO_MEMORY;
>@@ -98,7 +99,7 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
> 						 cli->dc->computer_name,
> 						 &clnt_chal_send, /* input. */
> 						 &srv_chal_recv, /* output. */
>-						 neg_flags_inout);
>+						 &neg_flags);
> 
> 	/* we might be talking to NT4, so let's downgrade in that case and retry
> 	 * with the returned neg_flags - gd */
>@@ -132,6 +133,9 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
> 		"chain established.\n",
> 		cli->desthost ));
> 
>+	cli->dc->negotiate_flags = neg_flags;
>+	*neg_flags_inout = neg_flags;
>+
> 	return NT_STATUS_OK;
> }
> 
>-- 
>1.6.3.3
>

Flags:

gd: review+

Actions: View

Attachments on bug 7160: 5400