[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-673-gf8425b7

Stefan Metzmacher metze at samba.org
Wed Sep 23 22:46:28 MDT 2009


The branch, master has been updated
       via  f8425b73d7b35e0f31124799d785f5e46dcbf972 (commit)
      from  9ef39406d8072a1a102813fb4448af76e9020fcd (commit)

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


- Log -----------------------------------------------------------------
commit f8425b73d7b35e0f31124799d785f5e46dcbf972
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Sep 24 06:45:10 2009 +0200

    Revert "s3:winbindd: use a tcp connection for lsa in case lookup_names/lookup_sids doesn't work over ncacn_np"
    
    This reverts commit f23691cffd39e5df81b7b075e61ed1def6cce9f6.
    
    This should not have been commited...
    
    metze

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

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


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index e83d5b0..05df19f 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2310,8 +2310,6 @@ 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);
@@ -2319,13 +2317,6 @@ 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


More information about the samba-cvs mailing list