diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-05 13:45:59 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-05 14:53:54 +0200 |
| commit | 61fb8a4fd1a8b30fffdf941a9ff843825bf966e3 (patch) | |
| tree | 50075c59f5f8baf5ced5d4dc45ba17d08293fe8f /source3/libsmb/clilist.c | |
| parent | 1cbe8b85ae155896e8a4ef39f4b129b2f1e6b1d8 (diff) | |
| download | samba-61fb8a4fd1a8b30fffdf941a9ff843825bf966e3.tar.gz samba-61fb8a4fd1a8b30fffdf941a9ff843825bf966e3.tar.bz2 samba-61fb8a4fd1a8b30fffdf941a9ff843825bf966e3.zip | |
s3: Explicitly pass flags2 to clistr_pull_talloc
Required to eventually make cli_list async
Diffstat (limited to 'source3/libsmb/clilist.c')
| -rw-r--r-- | source3/libsmb/clilist.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c index 56de119281..d0583f4e10 100644 --- a/source3/libsmb/clilist.c +++ b/source3/libsmb/clilist.c @@ -46,6 +46,8 @@ static size_t calc_next_entry_offset(const char *base, const char *pdata_end) static size_t interpret_long_filename(TALLOC_CTX *ctx, struct cli_state *cli, int level, + const char *base_ptr, + uint16_t recv_flags2, const char *p, const char *pdata_end, struct file_info *finfo, @@ -101,7 +103,8 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx, between win2000 and win9x for this call (tridge) */ ret = clistr_pull_talloc(ctx, - cli->inbuf, + base_ptr, + recv_flags2, &finfo->name, p, len+2, @@ -133,7 +136,8 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx, return pdata_end - base; } ret = clistr_pull_talloc(ctx, - cli->inbuf, + base_ptr, + recv_flags2, &finfo->name, p, len, @@ -194,7 +198,8 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx, return pdata_end - base; } ret = clistr_pull_talloc(ctx, - cli->inbuf, + base_ptr, + recv_flags2, &finfo->name, p, namelen, @@ -408,6 +413,8 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, p2 += interpret_long_filename(frame, cli, info_level, + cli->inbuf, + SVAL(cli->inbuf, smb_flg2), p2, rdata_end, &finfo, @@ -478,6 +485,8 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, p += interpret_long_filename(frame, cli, info_level, + cli->inbuf, + SVAL(cli->inbuf, smb_flg2), p, rdata_end, &finfo, @@ -523,6 +532,7 @@ static bool interpret_short_filename(TALLOC_CTX *ctx, finfo->size = IVAL(p,26); ret = clistr_pull_talloc(ctx, cli->inbuf, + SVAL(cli->inbuf, smb_flg2), &finfo->name, p+30, 12, |