[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Wed Sep 8 10:28:07 MDT 2010


The branch, master has been updated
       via  2226347 s3: Simplify cm_connect_sam a bit
       via  bcad45e s3: Check for sid instead of name in cm_connect_sam
      from  80eba81 s3-spoolss: Fixed a possible crash bug.

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


- Log -----------------------------------------------------------------
commit 2226347182322c845ca382142299ad9d1bf49abd
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Sep 7 17:38:24 2010 -0700

    s3: Simplify cm_connect_sam a bit

commit bcad45ed432b67715cb08f6555f218472f3977eb
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Sep 7 17:37:13 2010 -0700

    s3: Check for sid instead of name in cm_connect_sam

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

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


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index fca0a91..3f6d02e 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2080,12 +2080,8 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
 	char *machine_account = NULL;
 	char *domain_name = NULL;
 
-	if (strequal(domain->name, get_global_sam_name())) {
-		result = open_internal_samr_conn(mem_ctx, domain, cli, sam_handle);
-		if (!NT_STATUS_IS_OK(result)) {
-			return result;
-		}
-		return NT_STATUS_OK;
+	if (sid_check_is_domain(&domain->sid)) {
+		return open_internal_samr_conn(mem_ctx, domain, cli, sam_handle);
 	}
 
 	result = init_dc_connection_rpc(domain);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list