summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-07-08 12:35:36 +0200
committerStefan Metzmacher <metze@samba.org>2011-07-08 14:09:10 +0200
commitfc7359befb8939691d384824760ade97e6a74803 (patch)
treed76e6a944101805a992bb92e816b68480452b499
parent7d757d6ac3be143bb08d2deb61a4b2211b4d22cd (diff)
downloadsamba-fc7359befb8939691d384824760ade97e6a74803.tar.gz
s3:libsmb: clistr_pull_talloc() doesn't need base_ptr and flags2 with STR_ASCII
interpret_short_filename() always parses OEM_Strings (in DOS charset). metze
-rw-r--r--source3/libsmb/clilist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index 2c8a3288459..1aa5699be55 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -254,8 +254,8 @@ static bool interpret_short_filename(TALLOC_CTX *ctx,
finfo->mtime_ts.tv_nsec = finfo->atime_ts.tv_nsec = 0;
finfo->size = IVAL(p,26);
ret = clistr_pull_talloc(ctx,
- cli->inbuf,
- SVAL(cli->inbuf, smb_flg2),
+ NULL,
+ 0,
&finfo->name,
p+30,
12,