Changeset 988 for vendor/current/source4/libcli/dgram

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/source4/libcli/dgram

Files:

• dgramsocket.c (modified) (6 diffs)
• mailslot.c (modified) (1 diff)

vendor/current/source4/libcli/dgram/dgramsocket.c

@@ -49 +49 @@
 
         blob = data_blob_talloc(tmp_ctx, NULL, dsize);
-        if (blob.data == NULL) {
+        if ((dsize != 0) && (blob.data == NULL)) {
                 talloc_free(tmp_ctx);
                 return;
@@ -132 +132 @@
         }
 
-        EVENT_FD_NOT_WRITEABLE(dgmsock->fde);
+        TEVENT_FD_NOT_WRITEABLE(dgmsock->fde);
         return;
 }
@@ -145 +145 @@
         struct nbt_dgram_socket *dgmsock = talloc_get_type(private_data,
                                                            struct nbt_dgram_socket);
-        if (flags & EVENT_FD_WRITE) {
+        if (flags & TEVENT_FD_WRITE) {
                 dgm_socket_send(dgmsock);
         } 
-        if (flags & EVENT_FD_READ) {
+        if (flags & TEVENT_FD_READ) {
                 dgm_socket_recv(dgmsock);
         }
@@ -176 +176 @@
         talloc_steal(dgmsock, dgmsock->sock);
 
-        dgmsock->fde = event_add_fd(dgmsock->event_ctx, dgmsock, 
+        dgmsock->fde = tevent_add_fd(dgmsock->event_ctx, dgmsock,
                                     socket_get_fd(dgmsock->sock), 0,
                                     dgm_socket_handler, dgmsock);
@@ -203 +203 @@
         dgmsock->incoming.handler = handler;
         dgmsock->incoming.private_data = private_data;
-        EVENT_FD_READABLE(dgmsock->fde);
+        TEVENT_FD_READABLE(dgmsock->fde);
         return NT_STATUS_OK;
 }
@@ -232 +232 @@
         }
 
-        DLIST_ADD_END(dgmsock->send_queue, req, struct nbt_dgram_request *);
-
-        EVENT_FD_WRITEABLE(dgmsock->fde);
+        DLIST_ADD_END(dgmsock->send_queue, req);
+
+        TEVENT_FD_WRITEABLE(dgmsock->fde);
 
         return NT_STATUS_OK;

vendor/current/source4/libcli/dgram/mailslot.c

@@ -72 +72 @@
         talloc_set_destructor(dgmslot, dgram_mailslot_destructor);
 
-        EVENT_FD_READABLE(dgmsock->fde);
+        TEVENT_FD_READABLE(dgmsock->fde);
 
         return dgmslot;