From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 18 Nov 2011 07:40:18 +0000 (+0100)
Subject: s3:libsmb: only align unicode pipe_name (bug #8586)
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=10f45157037edc528926ae7dc4a40909566c6480;p=metze%2Fsamba%2Fwip.git

s3:libsmb: only align unicode pipe_name (bug #8586)

metze
(cherry picked from commit 48bcb8c846532ccd5489ef705182fb81c5278b04)
---

diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index 2f2801ec3f44..844ad2b9c2c7 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;