From: Andreas Schneider <asn@samba.org>
Date: Thu, 8 Jun 2017 13:02:16 +0000 (+0200)
Subject: Revert "libcli:smb: Fix pulling strings from the wire"
X-Git-Tag: ldb-1.1.31~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c786c61d1a72f3f8782e8f5a4a087276ce161a6e;p=thirdparty%2Fsamba.git

Revert "libcli:smb: Fix pulling strings from the wire"

This reverts commit a4efe647c51700cee93b7574e5955e264aa96893.

A different fix will follow.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12824

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/libcli/smb/util.c b/libcli/smb/util.c
index 80d34281adf..ef8c9fafa35 100644
--- a/libcli/smb/util.c
+++ b/libcli/smb/util.c
@@ -372,6 +372,6 @@ NTSTATUS smb_bytes_pull_str(TALLOC_CTX *mem_ctx, char **_str, bool ucs2,
 			    const uint8_t *buf, size_t buf_len,
 			    size_t *_buf_consumed)
 {
-	return internal_bytes_pull_str(mem_ctx, _str, ucs2, false,
+	return internal_bytes_pull_str(mem_ctx, _str, ucs2, true,
 				       buf, buf_len, _buf_consumed);
 }