[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-672-g9ef3940

[Stefan Metzmacher]

The branch, master has been updated
       via  9ef39406d8072a1a102813fb4448af76e9020fcd (commit)
       via  f23691cffd39e5df81b7b075e61ed1def6cce9f6 (commit)
      from  4f9de0e995cbdebe8919bc703ea257149f02d5b1 (commit)

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


- Log -----------------------------------------------------------------
commit 9ef39406d8072a1a102813fb4448af76e9020fcd
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Sep 24 06:38:08 2009 +0200

    s3:rpc_server: we need to make a copy of my_name in serverinfo_to_SamInfo_base()
    
    This is important for the case the server_info already contains a logon_server.
    
    metze

commit f23691cffd39e5df81b7b075e61ed1def6cce9f6
Author: Günther Deschner <gd at samba.org>
Date:   Thu Sep 17 09:43:36 2009 +0200

    s3:winbindd: use a tcp connection for lsa in case lookup_names/lookup_sids doesn't work over ncacn_np
    
    metze

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

Summary of changes:
 source3/rpc_server/srv_pipe_hnd.c |    2 +-
 source3/winbindd/winbindd_cm.c    |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index 7711d6c..0c858c2 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -1654,7 +1654,7 @@ static NTSTATUS serverinfo_to_SamInfo_base(TALLOC_CTX *mem_ctx,
 	base->groups			= groups;
 	base->user_flags		= NETLOGON_EXTRA_SIDS;
 	base->key			= user_session_key;
-	base->logon_server.string	= my_name;
+	base->logon_server.string	= talloc_strdup(mem_ctx, my_name);
 	base->domain.string		= talloc_strdup(mem_ctx, pdb_get_domain(sampw));
 	base->domain_sid		= sid;
 	base->LMSessKey			= lm_session_key;
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 05df19f..e83d5b0 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2310,6 +2310,8 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
 	DEBUG(10,("cm_connect_lsa: connected to LSA pipe for domain %s using "
 		  "schannel.\n", domain->name ));
 
+	domain->can_do_ncacn_ip_tcp = domain->active_directory;
+
 	result = rpccli_lsa_open_policy(conn->lsa_pipe, mem_ctx, True,
 					SEC_FLAG_MAXIMUM_ALLOWED,
 					&conn->lsa_policy);
@@ -2317,6 +2319,13 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
 		goto done;
 	}
 
+	if (NT_STATUS_EQUAL(result, NT_STATUS_RPC_CANNOT_SUPPORT)) {
+		domain->can_do_ncacn_ip_tcp = true;
+		ZERO_STRUCT(conn->lsa_policy);
+		result = NT_STATUS_OK;
+		goto done;
+	}
+
 	DEBUG(10,("cm_connect_lsa: rpccli_lsa_open_policy failed, trying "
 		  "anonymous\n"));
 


-- 
Samba Shared Repository