Changeset 988 for vendor/current/source3/libsmb/climessage.c

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/libsmb/climessage.c (modified) (7 diffs)

vendor/current/source3/libsmb/climessage.c

@@ -22 +22 @@
 #include "async_smb.h"
 #include "libsmb/libsmb.h"
+#include "../libcli/smb/smbXcli_base.h"
 
 struct cli_message_start_state {
@@ -50 +51 @@
         if (!convert_string_talloc(talloc_tos(), CH_UNIX, CH_DOS,
                                    username, strlen(username)+1,
-                                   &utmp, &ulen, true)) {
+                                   &utmp, &ulen)) {
                 goto fail;
         }
         if (!convert_string_talloc(talloc_tos(), CH_UNIX, CH_DOS,
                                    host, strlen(host)+1,
-                                   &htmp, &hlen, true)) {
+                                   &htmp, &hlen)) {
                 goto fail;
         }
@@ -97 +98 @@
         uint8_t wct;
         uint16_t *vwv;
-        uint8_t *inbuf;
-
-        status = cli_smb_recv(subreq, state, &inbuf, 0, &wct, &vwv,
+
+        status = cli_smb_recv(subreq, state, NULL, 0, &wct, &vwv,
                               NULL, NULL);
         TALLOC_FREE(subreq);
@@ -157 +157 @@
 
         if (convert_string_talloc(talloc_tos(), CH_UNIX, CH_DOS, msg, msglen,
-                                  &tmp, &tmplen, true)) {
+                                  &tmp, &tmplen)) {
                 msg = tmp;
                 msglen = tmplen;
@@ -385 +385 @@
 {
         TALLOC_CTX *frame = talloc_stackframe();
-        struct event_context *ev;
+        struct tevent_context *ev;
         struct tevent_req *req;
         NTSTATUS status = NT_STATUS_OK;
 
-        if (cli_has_async_calls(cli)) {
+        if (smbXcli_conn_has_async_calls(cli->conn)) {
                 /*
                  * Can't use sync call while an async call is in flight
@@ -397 +397 @@
         }
 
-        ev = event_context_init(frame);
+        ev = samba_tevent_context_init(frame);
         if (ev == NULL) {
                 status = NT_STATUS_NO_MEMORY;
@@ -409 +409 @@
         }
 
-        if (!tevent_req_poll(req, ev)) {
-                status = map_nt_error_from_unix(errno);
+        if (!tevent_req_poll_ntstatus(req, ev, &status)) {
                 goto fail;
         }