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

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

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

trunk/server/source3/winbindd/winbindd_cm.c

@@ -836 +836 @@
         }
 
-        if (ntohs(peeraddr_in->sin_port) == 139) {
-                struct nmb_name calling;
-                struct nmb_name called;
-
-                make_nmb_name(&calling, global_myname(), 0x0);
-                make_nmb_name(&called, "*SMBSERVER", 0x20);
-
-                if (!cli_session_request(*cli, &calling, &called)) {
-                        DEBUG(8, ("cli_session_request failed for %s\n",
-                                  controller));
-                        result = NT_STATUS_UNSUCCESSFUL;
-                        goto done;
-                }
-        }
-
         result = cli_negprot(*cli);
 
@@ -1355 +1340 @@
         int num_addrs = 0;
 
-        int i, fd_index;
+        int i;
+        size_t fd_index;
+
+        NTSTATUS status;
 
         *fd = -1;
@@ -1373 +1361 @@
                         return False;
                 }
-
-                if (!add_string_to_array(mem_ctx, dcs[i].name,
-                                    &dcnames, &num_dcnames)) {
-                        return False;
-                }
-                if (!add_sockaddr_to_array(mem_ctx, &dcs[i].ss, 139,
-                                      &addrs, &num_addrs)) {
-                        return False;
-                }
         }
 
@@ -1390 +1369 @@
                 return False;
 
-        /* 5 second timeout. */
-        if (!open_any_socket_out(addrs, num_addrs, 5000, &fd_index, fd) ) {
+        status = smbsock_any_connect(addrs, dcnames, num_addrs,
+                                     fd, &fd_index, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
                 for (i=0; i<num_dcs; i++) {
                         char ab[INET6_ADDRSTRLEN];
                         print_sockaddr(ab, sizeof(ab), &dcs[i].ss);
-                        DEBUG(10, ("find_new_dc: open_any_socket_out failed for "
+                        DEBUG(10, ("find_new_dc: smbsock_any_connect failed for "
                                 "domain %s address %s. Error was %s\n",
-                                domain->name, ab, strerror(errno) ));
+                                   domain->name, ab, nt_errstr(status) ));
                         winbind_add_failed_connection_entry(domain,
                                 dcs[i].name, NT_STATUS_UNSUCCESSFUL);
@@ -1499 +1479 @@
                         && (resolve_name(domain->dcname, &domain->dcaddr, 0x20, true)))
                 {
-                        struct sockaddr_storage *addrs = NULL;
-                        int num_addrs = 0;
-                        int dummy = 0;
-
-                        if (!add_sockaddr_to_array(mem_ctx, &domain->dcaddr, 445, &addrs, &num_addrs)) {
-                                set_domain_offline(domain);
-                                talloc_destroy(mem_ctx);
-                                return NT_STATUS_NO_MEMORY;
-                        }
-                        if (!add_sockaddr_to_array(mem_ctx, &domain->dcaddr, 139, &addrs, &num_addrs)) {
-                                set_domain_offline(domain);
-                                talloc_destroy(mem_ctx);
-                                return NT_STATUS_NO_MEMORY;
-                        }
-
-                        /* 5 second timeout. */
-                        if (!open_any_socket_out(addrs, num_addrs, 5000, &dummy, &fd)) {
+                        NTSTATUS status;
+
+                        status = smbsock_connect(&domain->dcaddr, NULL, NULL,
+                                                 &fd, NULL);
+                        if (!NT_STATUS_IS_OK(status)) {
                                 fd = -1;
                         }
@@ -1978 +1946 @@
 
         domain->can_do_ncacn_ip_tcp = domain->active_directory;
+        domain->can_do_validation6 = domain->active_directory;
 
         TALLOC_FREE(cli);