[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1263-g8d3e61e

[Günther Deschner]

The branch, master has been updated
       via  8d3e61e5ce965eeaad5c5239ddb4fdb56071597c (commit)
      from  5b33624113781bbe56956e4e09a4860dd507c9ed (commit)

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


- Log -----------------------------------------------------------------
commit 8d3e61e5ce965eeaad5c5239ddb4fdb56071597c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 24 03:09:20 2009 +0200

    s3-netlogon: Start fixing rpccli_netlogon_setup_creds after auth merge.
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 32485ea..cfaf9f3 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -72,8 +72,8 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
 	/* Calculate the session key and client credentials */
 	
 	cli->dc = netlogon_creds_client_init(cli,
+				    mach_acct,
 				    clnt_name,
-				    machine_account, 
 				    &clnt_chal_send,
 				    &srv_chal_recv,
 				    &password,
@@ -101,6 +101,7 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
 	 * with the returned neg_flags - gd */
 
 	if (NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED) && !retried) {
+		retried = true;
 		TALLOC_FREE(cli->dc);
 		goto again;
 	}


-- 
Samba Shared Repository