[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  10f4515 s3:libsmb: only align unicode pipe_name (bug #8586)
      from  a64f88f s3-winbind: Don't fail on users without a uid.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 10f45157037edc528926ae7dc4a40909566c6480
Author: Stefan Metzmacher <me...@samba.org>
Date:   Fri Nov 18 08:40:18 2011 +0100

    s3:libsmb: only align unicode pipe_name (bug #8586)
    
    metze
    (cherry picked from commit 48bcb8c846532ccd5489ef705182fb81c5278b04)

-----------------------------------------------------------------------

Summary of changes:
 source3/libsmb/clitrans.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index 2f2801e..844ad2b 100644
--- a/source3/libsmb/clitrans.c
+++ b/source3/libsmb/clitrans.c
@@ -208,14 +208,18 @@ static void cli_trans_format(struct cli_trans_state 
*state, uint8_t *pwct,
 
        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:
                pad[0] = 0;


-- 
Samba Shared Repository