Changeset 751 for trunk/server/source3/winbindd/winbindd_cm.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/winbindd/winbindd_cm.c (modified) (3 diffs)

trunk/server/source3/winbindd/winbindd_cm.c

@@ -1186 +1186 @@
 
                 ads_destroy( &ads );
+                return false;
         }
 #endif
 
-        status = nbt_getdc(winbind_messaging_context(), pss, domain->name,
+        status = nbt_getdc(winbind_messaging_context(), 10, pss, domain->name,
                            &domain->sid, nt_version, mem_ctx, &nt_version,
                            &dc_name, NULL);
@@ -1769 +1770 @@
         }
 
-        if (!winbindd_can_contact_domain(domain)) {
-                invalidate_cm_connection(&domain->conn);
-                domain->initialized = True;
-                return NT_STATUS_OK;
-        }
-
         if (connection_ok(domain)) {
                 if (!domain->initialized) {
@@ -1927 +1922 @@
                                  domain->active_directory ? "" : "NOT "));
 
+                        domain->can_do_ncacn_ip_tcp = domain->active_directory;
+                        domain->can_do_validation6 = domain->active_directory;
 
                         domain->initialized = True;