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

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

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

vendor/current/libcli/cldap/cldap.c

@@ -168 +168 @@
 }
 
-static void cldap_socket_recv_dgram(struct cldap_socket *c,
+static bool cldap_socket_recv_dgram(struct cldap_socket *c,
                                     struct cldap_incoming *in);
 
@@ -177 +177 @@
         struct cldap_incoming *in = NULL;
         ssize_t ret;
+        bool setup_done;
 
         c->recv_subreq = NULL;
@@ -200 +201 @@
 
         /* this function should free or steal 'in' */
-        cldap_socket_recv_dgram(c, in);
+        setup_done = cldap_socket_recv_dgram(c, in);
         in = NULL;
 
-        if (!cldap_recvfrom_setup(c)) {
+        if (!setup_done && !cldap_recvfrom_setup(c)) {
                 goto nomem;
         }
@@ -219 +220 @@
   handle recv events on a cldap socket
 */
-static void cldap_socket_recv_dgram(struct cldap_socket *c,
+static bool cldap_socket_recv_dgram(struct cldap_socket *c,
                                     struct cldap_incoming *in)
 {
@@ -263 +264 @@
                 /* this function should free or steal 'in' */
                 c->incoming.handler(c, c->incoming.private_data, in);
-                return;
+                return false;
         }
 
@@ -271 +272 @@
         search->response.asn1->ofs = 0;
 
+        DLIST_REMOVE(c->searches.list, search);
+
+        if (!cldap_recvfrom_setup(c)) {
+                goto nomem;
+        }
+
         tevent_req_done(search->req);
-        goto done;
+        talloc_free(in);
+        return true;
 
 nomem:
@@ -290 +298 @@
 done:
         talloc_free(in);
+        return false;
 }
 
@@ -321 +330 @@
 
         if (!local_addr) {
-                ret = tsocket_address_inet_from_strings(c, "ip",
+                /* 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",
                                                         NULL, 0,
                                                         &any);
@@ -947 +960 @@
 */
 NTSTATUS cldap_netlogon_recv(struct tevent_req *req,
-                             struct smb_iconv_convenience *iconv_convenience,
                              TALLOC_CTX *mem_ctx,
                              struct cldap_netlogon *io)
@@ -975 +987 @@
 
         status = pull_netlogon_samlogon_response(data, mem_ctx,
-                                                 iconv_convenience,
                                                  &io->out.netlogon);
         if (!NT_STATUS_IS_OK(status)) {
@@ -995 +1006 @@
 */
 NTSTATUS cldap_netlogon(struct cldap_socket *cldap,
-                        struct smb_iconv_convenience *iconv_convenience,
                         TALLOC_CTX *mem_ctx,
                         struct cldap_netlogon *io)
@@ -1018 +1028 @@
         }
 
-        status = cldap_netlogon_recv(req, iconv_convenience, mem_ctx, io);
+        status = cldap_netlogon_recv(req, mem_ctx, io);
         talloc_free(req);
 
@@ -1082 +1092 @@
 */
 NTSTATUS cldap_netlogon_reply(struct cldap_socket *cldap,
-                              struct smb_iconv_convenience *iconv_convenience,
                               uint32_t message_id,
                               struct tsocket_address *dest,
@@ -1096 +1105 @@
 
         status = push_netlogon_samlogon_response(&blob, tmp_ctx,
-                                                 iconv_convenience,
                                                  netlogon);
         if (!NT_STATUS_IS_OK(status)) {