connect to the right realm or domain for trusted AD domains

(This used to be commit 83376671c511be4bb10d3fca8e49e5f6ef792b9c)

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 92f7f7645ac827a115fb8899d43b5afd46c088a2..cf6f9375f8821f775a460e993cfe80897e9d20f7 100644 (file)
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -109,12 +109,8 @@ static BOOL ads_find_dc(ADS_STRUCT *ads)
 
        /* realm */
        c_realm = ads->server.realm;
-       if (!c_realm || !*c_realm) {
-               c_realm = lp_realm();
-       }
-       if ( c_realm )
+       if (c_realm && *c_realm) 
                got_realm = True;
-
           
 again:
        /* we need to try once with the realm name and fallback to the 
@@ -122,10 +118,10 @@ again:
           
        if ( !got_realm && !lp_disable_netbios() ) {
                c_realm = ads->server.workgroup;
-               if (!c_realm || !*c_realm) 
-                       c_realm = lp_workgroup();
-               if (!c_realm)
+               if (!c_realm || !*c_realm) {
+                       DEBUG(0,("ads_find_dc: no realm or workgroup!  Was the structure initialized?\n"));
                        return False;
+               }
        }
        
        pstrcpy( realm, c_realm );