[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  4f7f143 dfsreferral: search client's site and use it
      from  a9e4592 s4-dbcheck: fix uninitialized errstr in err_dn_target_mismatch

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


- Log -----------------------------------------------------------------
commit 4f7f1430268f0ab5447fe189da6435bdd8e0614e
Author: Matthieu Patou <mat at matws.net>
Date:   Thu Jun 23 02:35:50 2011 +0400

    dfsreferral: search client's site and use it
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Thu Jun 23 01:50:39 CEST 2011 on sn-devel-104

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

Summary of changes:
 source4/smb_server/smb/trans2.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c
index b3aa690..72babd5 100644
--- a/source4/smb_server/smb/trans2.c
+++ b/source4/smb_server/smb/trans2.c
@@ -1107,7 +1107,7 @@ static NTSTATUS get_dcs(TALLOC_CTX *ctx, struct ldb_context *ldb,
 	}
 	talloc_free(r);
 
-	if (searched_site != NULL) {
+	if (searched_site != NULL && searched_site[0] != '\0') {
 		ret = ldb_search(ldb, subctx, &r, configdn, LDB_SCOPE_SUBTREE,
 				 attrs_none, "(&(name=%s)(objectClass=site))", searched_site);
 		if (ret != LDB_SUCCESS) {
@@ -1461,7 +1461,7 @@ static NTSTATUS dodc_or_sysvol_referral(TALLOC_CTX *ctx,
 		client_addr = tsocket_address_inet_addr_string(remote_address, context);
 		NT_STATUS_HAVE_NO_MEMORY_AND_FREE(client_addr, context);
 	}
-
+	site_name = samdb_client_site_name(ldb, context, client_addr, NULL);
 	status = get_dcs(context, ldb, site_name, need_fqdn, &set, 0);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(3,("Unable to get list of DCs\n"));


-- 
Samba Shared Repository