[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3451-g0bd5253

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  0bd5253c05530b25aa9261019ef028728a8f9c75 (commit)
       via  2f3eafae83d036c5b35e5d7d11be6e29aaab7533 (commit)
      from  9cb2dfb1acc958c73f195ddc2480f267262e7d74 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 0bd5253c05530b25aa9261019ef028728a8f9c75
Merge: 2f3eafae83d036c5b35e5d7d11be6e29aaab7533 9cb2dfb1acc958c73f195ddc2480f267262e7d74
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Feb 11 14:37:27 2009 -0800

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

commit 2f3eafae83d036c5b35e5d7d11be6e29aaab7533
Author: Yasuma Takeda <yasuma at osstech.co.jp>
Date:   Wed Feb 11 14:23:29 2009 -0800

    Fix bug #6098 - When the DNS server is invalid, the ads_find_dc() does not work correctly with "security = domain"
    
    1. If DNS server is invalid, the get_sorted_dc_list() is called with
    realm(FQDN) and it fails.
    2. On the next step, the get_sorted_dc_list() is called with realm(FQDN) again.
    
    I think "again" is wrong place.
    On the 2nd step, get_sorted_dc_list() should be called with realm(WORKGROUP).

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

Summary of changes:
 source/libads/ldap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 47b9f3e..9eae2d4 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -299,6 +299,8 @@ static NTSTATUS ads_find_dc(ADS_STRUCT *ads)
 	if (c_realm && *c_realm)
 		got_realm = True;
 
+ again:
+
 	/* we need to try once with the realm name and fallback to the
 	   netbios domain name if we fail (if netbios has not been disabled */
 
@@ -350,8 +352,6 @@ static NTSTATUS ads_find_dc(ADS_STRUCT *ads)
 
 	sitename = sitename_fetch(realm);
 
- again:
-
 	DEBUG(6,("ads_find_dc: (cldap) looking for %s '%s'\n",
 		(got_realm ? "realm" : "domain"), realm));
 


-- 
Samba Shared Repository