[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  a3e3355... s3:cli_netlogon: keep the the correct negotiate_flags on 
the cli->dc structure
      from  b7d5b46... s3: Avoid calling cli_alloc_mid twice in 
cli_smb_req_iov_send

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit a3e3355b5ccf74a2ffe5da6cbb2747e74586b1e5
Author: Stefan Metzmacher <me...@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
    (cherry picked from commit 1e9df26ef970df41de54142a78606a15374acbac)

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

Summary of changes:
 source3/rpc_client/cli_netlogon.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_client/cli_netlogon.c 
b/source3/rpc_client/cli_netlogon.c
index 0388447..9cb0bc6 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;
 }
 


-- 
Samba Shared Repository