Changeset 989 for vendor/current/source3/libsmb

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/source3/libsmb

Files:

• cli_smb2_fnum.c (modified) (13 diffs)
• cliconnect.c (modified) (2 diffs)
• clifile.c (modified) (1 diff)

vendor/current/source3/libsmb/cli_smb2_fnum.c

@@ -177 +177 @@
         struct tevent_req *req, *subreq;
         struct cli_smb2_create_fnum_state *state;
+        size_t fname_len = 0;
 
         req = tevent_req_create(mem_ctx, &state,
@@ -198 +199 @@
         if (*fname == '\\') {
                 fname++;
+        }
+
+        /* Or end in a '\' */
+        fname_len = strlen(fname);
+        if (fname_len > 0 && fname[fname_len-1] == '\\') {
+                char *new_fname = talloc_strdup(state, fname);
+                if (tevent_req_nomem(new_fname, req)) {
+                        return tevent_req_post(req, ev);
+                }
+                new_fname[fname_len-1] = '\0';
+                fname = new_fname;
         }
 
@@ -263 +275 @@
 
         if (tevent_req_is_nterror(req, &status)) {
+                state->cli->raw_status = status;
                 return status;
         }
@@ -271 +284 @@
                 *cr = state->cr;
         }
+        state->cli->raw_status = NT_STATUS_OK;
         return NT_STATUS_OK;
 }
@@ -391 +405 @@
 NTSTATUS cli_smb2_close_fnum_recv(struct tevent_req *req)
 {
-        return tevent_req_simple_recv_ntstatus(req);
+        struct cli_smb2_close_fnum_state *state = tevent_req_data(
+                req, struct cli_smb2_close_fnum_state);
+        NTSTATUS status = tevent_req_simple_recv_ntstatus(req);
+        state->cli->raw_status = status;
+        return status;
 }
 
@@ -2303 +2321 @@
 
         if (tevent_req_is_nterror(req, &status)) {
+                state->cli->raw_status = status;
                 return status;
         }
@@ -2312 +2331 @@
         *received = (ssize_t)state->received;
         *rcvbuf = state->buf;
+        state->cli->raw_status = NT_STATUS_OK;
         return NT_STATUS_OK;
 }
@@ -2410 +2430 @@
 
         if (tevent_req_is_nterror(req, &status)) {
+                state->cli->raw_status = status;
                 tevent_req_received(req);
                 return status;
@@ -2417 +2438 @@
                 *pwritten = (size_t)state->written;
         }
+        state->cli->raw_status = NT_STATUS_OK;
         tevent_req_received(req);
         return NT_STATUS_OK;
@@ -2574 +2596 @@
 
         if (tevent_req_is_nterror(req, &status)) {
+                state->cli->raw_status = status;
                 return status;
         }
@@ -2579 +2602 @@
                 *pwritten = (size_t)state->written;
         }
+        state->cli->raw_status = NT_STATUS_OK;
         return NT_STATUS_OK;
 }
@@ -2839 +2863 @@
 
         if (tevent_req_is_nterror(req, &status)) {
+                state->cli->raw_status = status;
                 tevent_req_received(req);
                 return status;
@@ -2845 +2870 @@
                 *written = state->written;
         }
+        state->cli->raw_status = NT_STATUS_OK;
         tevent_req_received(req);
         return NT_STATUS_OK;

vendor/current/source3/libsmb/cliconnect.c

@@ -1589 +1589 @@
                          *
                          * So just pretend we are completely done.
+                         *
+                         * Note that smbXcli_session_is_guest()
+                         * always returns false if we require signing.
                          */
                         state->blob_in = data_blob_null;
@@ -3106 +3109 @@
 
                 state->desthost = host;
-        } else {
+        } else if (dest_ss != NULL) {
                 state->desthost = print_canonical_sockaddr(state, dest_ss);
                 if (tevent_req_nomem(state->desthost, req)) {
                         return tevent_req_post(req, ev);
                 }
+        } else {
+                /* No host or dest_ss given. Error out. */
+                tevent_req_error(req, EINVAL);
+                return tevent_req_post(req, ev);
         }
 

vendor/current/source3/libsmb/clifile.c

@@ -4594 +4594 @@
                            setup, 1, 0,
                            param, param_len, 2,
-                           data,  data_len, CLI_BUFFER_SIZE,
+                           data,  data_len, 0,
                            NULL,
                            NULL, 0, NULL, /* rsetup */