Changeset 746 for vendor/current/source3/libsmb/clitrans.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/source3/libsmb/clitrans.c (modified) (2 diffs)

vendor/current/source3/libsmb/clitrans.c

@@ -209 +209 @@
         switch (cmd) {
         case SMBtrans:
-                pad[0] = 0;
-                iov[0].iov_base = (void *)pad;
-                iov[0].iov_len = 1;
-                iov[1].iov_base = (void *)state->pipe_name_conv;
-                iov[1].iov_len = state->pipe_name_conv_len;
+                if (cli_ucs2(state->cli)) {
+                        pad[0] = 0;
+                        iov[0].iov_base = (void *)pad;
+                        iov[0].iov_len = 1;
+                        param_offset += 1;
+                        iov += 1;
+                }
+                iov[0].iov_base = (void *)state->pipe_name_conv;
+                iov[0].iov_len = state->pipe_name_conv_len;
                 wct = 14 + state->num_setup;
-                param_offset += iov[0].iov_len + iov[1].iov_len;
-                iov += 2;
+                param_offset += iov[0].iov_len;
+                iov += 1;
                 break;
         case SMBtrans2:
@@ -762 +766 @@
  fail:
         TALLOC_FREE(frame);
-        if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
-        }
         return status;
 }