[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  1e9df26... s3:cli_netlogon: keep the the correct negotiate_flags on the cli->dc structure
       via  ddfd5b6... s3:selftest: $WORKGROUP doesn't exist, we should use $DOMAIN
      from  752bffc... s3: Consolidate server_id_self into the equivalent procid_self()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1e9df26ef970df41de54142a78606a15374acbac
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Feb 19 23:22:40 2010 +0100

    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.
    
    This fixes bug #7160.
    
    metze

commit ddfd5b69a0512937c101ef4338b57526c9f188bb
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 23 16:12:31 2010 +0100

    s3:selftest: $WORKGROUP doesn't exist, we should use $DOMAIN
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_client/cli_netlogon.c |    8 ++++++--
 source3/selftest/tests.sh         |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

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;
 }
 
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 1910088..2fe54b2 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -105,7 +105,7 @@ export PASSWORD
 	shift $#
 	testitprefix="wbinfo_s3."
 	testitenv="dc:local"
-	. $SCRIPTDIR/test_wbinfo_s3.sh \$WORKGROUP \$SERVER \$USERNAME \$PASSWORD
+	. $SCRIPTDIR/test_wbinfo_s3.sh \$DOMAIN \$SERVER \$USERNAME \$PASSWORD
 )
 
 (


-- 
Samba Shared Repository