diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-07-07 14:46:40 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-07-07 19:16:27 +0200 |
| commit | af66c64e95183647bce39754089c591cbbdfbc50 (patch) | |
| tree | 35ca1d875023b5119f9d593aeaa01809e9dd594a /source3/libsmb/clilist.c | |
| parent | eaeeb5ce0e7282cf0d4db3dd9f39848b0afcb1fa (diff) | |
| download | samba-af66c64e95183647bce39754089c591cbbdfbc50.tar.gz samba-af66c64e95183647bce39754089c591cbbdfbc50.tar.bz2 samba-af66c64e95183647bce39754089c591cbbdfbc50.zip | |
s3:libsmb: interpret_long_filename() short_name is always UNICODE
metze
Diffstat (limited to 'source3/libsmb/clilist.c')
| -rw-r--r-- | source3/libsmb/clilist.c | 11 |
1 files changed, 3 insertions, 8 deletions
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; |