From af66c64e95183647bce39754089c591cbbdfbc50 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 7 Jul 2011 14:46:40 +0200
Subject: s3:libsmb: interpret_long_filename() short_name is always UNICODE

metze
---
 source3/libsmb/clilist.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'source3/libsmb')

diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index 9eec97fbeb..0792e4057b 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -189,14 +189,9 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
 				return pdata_end - base;
 			}
 			p += 2;
-			{
-				/* stupid NT bugs. grr */
-				int flags = 0;
-				if (p[1] == 0 && namelen > 1) flags |= STR_UNICODE;
-				clistr_pull(base_ptr, finfo->short_name, p,
-					    sizeof(finfo->short_name),
-					    slen, flags);
-			}
+			clistr_pull(base_ptr, finfo->short_name, p,
+				    sizeof(finfo->short_name),
+				    slen, STR_UNICODE);
 			p += 24; /* short name? */
 			if (p + namelen < p || p + namelen > pdata_end) {
 				return pdata_end - base;
-- 
cgit