Changeset 165 for branches/samba-3.0/source/libads/ldap.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (17 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/libads/ldap.c (modified) (4 diffs)

branches/samba-3.0/source/libads/ldap.c

@@ -157 +157 @@
         }
 
+
+
+
+
+
         DEBUG(10,("ads_closest_dc: %s is not the closest DC\n", 
                 ads->config.ldap_server_name));
@@ -244 +249 @@
 static NTSTATUS ads_find_dc(ADS_STRUCT *ads)
 {
+
         const char *c_realm;
         int count, i=0;
         struct ip_service *ip_list;
+
         pstring realm;
         BOOL got_realm = False;
@@ -278 +285 @@
                                 c_realm = lp_workgroup();
                 }
-                
-                if ( !c_realm || !*c_realm ) {
-                        DEBUG(0,("ads_find_dc: no realm or workgroup!  Don't know what to do\n"));
-                        return NT_STATUS_INVALID_PARAMETER; /* rather need MISSING_PARAMETER ... */
-                }
-        }
-        
+        }
+
+        if ( !c_realm || !*c_realm ) {
+                DEBUG(0,("ads_find_dc: no realm or workgroup!  Don't know what to do\n"));
+                return NT_STATUS_INVALID_PARAMETER; /* rather need MISSING_PARAMETER ... */
+        }
+
+        if ( use_own_domain ) {
+                c_domain = lp_workgroup();
+        } else {
+                c_domain = ads->server.workgroup;
+        }
+
+        pstrcpy( domain, c_domain );
         pstrcpy( realm, c_realm );
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         sitename = sitename_fetch(realm);
 
  again:
 
-        DEBUG(6,("ads_find_dc: looking for %s '%s'\n", 
+        DEBUG(6,("ads_find_dc: 
                 (got_realm ? "realm" : "domain"), realm));
 
@@ -436 +474 @@
         /* cache the successful connection for workgroup and realm */
         if (ads_closest_dc(ads)) {
-                saf_store( ads->server.workgroup, inet_ntoa(ads->ldap_ip));
-                saf_store( ads->server.realm, inet_ntoa(ads->ldap_ip));
+                saf_store( ads->server.workgroup, );
+                saf_store( ads->server.realm, );
         }