Changeset 746 for vendor/current/libcli/cldap/cldap.c

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

File:

• vendor/current/libcli/cldap/cldap.c (modified) (5 diffs)

vendor/current/libcli/cldap/cldap.c

@@ -274 +274 @@
         DLIST_REMOVE(c->searches.list, search);
 
-        if (!cldap_recvfrom_setup(c)) {
-                goto nomem;
-        }
+        cldap_recvfrom_setup(c);
 
         tevent_req_done(search->req);
-        talloc_free(in);
         return true;
 
@@ -287 +284 @@
         status = map_nt_error_from_unix(in->recv_errno);
 nterror:
+        TALLOC_FREE(in);
         /* in connected mode the first pending search gets the error */
         if (!c->connected) {
@@ -295 +293 @@
                 goto done;
         }
+        cldap_recvfrom_setup(c);
         tevent_req_nterror(c->searches.list->req, status);
+        return true;
 done:
-        talloc_free(in);
+        TALLOC_FREE(in);
         return false;
 }
@@ -314 +314 @@
         NTSTATUS status;
         int ret;
+        const char *fam = NULL;
+
+        if (local_addr == NULL && remote_addr == NULL) {
+                return NT_STATUS_INVALID_PARAMETER_MIX;
+        }
+
+        if (remote_addr) {
+                bool is_ipv4;
+                bool is_ipv6;
+
+                is_ipv4 = tsocket_address_is_inet(remote_addr, "ipv4");
+                is_ipv6 = tsocket_address_is_inet(remote_addr, "ipv6");
+
+                if (is_ipv4) {
+                        fam = "ipv4";
+                } else if (is_ipv6) {
+                        fam = "ipv6";
+                } else {
+                        return NT_STATUS_INVALID_ADDRESS;
+                }
+        }
 
         c = talloc_zero(mem_ctx, struct cldap_socket);
@@ -330 +351 @@
 
         if (!local_addr) {
-                /* we use ipv4 here instead of ip, as otherwise we end
-                   up with a PF_INET6 socket, and sendto() for ipv4
-                   addresses will fail. That breaks cldap name
-                   resolution for winbind to IPv4 hosts. */
-                ret = tsocket_address_inet_from_strings(c, "ipv4",
+                /*
+                 * Here we know the address family of the remote address.
+                 */
+                if (fam == NULL) {
+                        return NT_STATUS_INVALID_PARAMETER_MIX;
+                }
+
+                ret = tsocket_address_inet_from_strings(c, fam,
                                                         NULL, 0,
                                                         &any);