diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-03-14 12:42:43 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-03-14 12:42:43 +0000 |
| commit | 9ea70bd00349bc391809bec374700c6d9ce2952b (patch) | |
| tree | 4a5aeb71abe62792cb9fa9c03feaa6f2401e6272 /source3/libsmb/clilist.c | |
| parent | 376a44c81d360026eb0c2886e9a05dd2bfefd2cc (diff) | |
| download | samba-9ea70bd00349bc391809bec374700c6d9ce2952b.tar.gz samba-9ea70bd00349bc391809bec374700c6d9ce2952b.tar.bz2 samba-9ea70bd00349bc391809bec374700c6d9ce2952b.zip | |
simpler clistr interface which handles individual packets having
unicode bit set differently to capabilities
(This used to be commit 34a0821e087810381996f5ff6cf3b4d7b9bb53a0)
Diffstat (limited to 'source3/libsmb/clilist.c')
| -rw-r--r-- | source3/libsmb/clilist.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c index f0ca0d5f54..0033f05942 100644 --- a/source3/libsmb/clilist.c +++ b/source3/libsmb/clilist.c @@ -194,10 +194,6 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, break; } - param_len = 12+clistr_push_size(cli, NULL, mask, -1, - STR_TERMINATE | - STR_CONVERT); - if (First) { setup = TRANSACT2_FINDFIRST; SSVAL(param,0,attribute); /* attribute */ @@ -205,8 +201,9 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, SSVAL(param,4,4+2); /* resume required + close on end */ SSVAL(param,6,info_level); SIVAL(param,8,0); - clistr_push(cli, param+12, mask, -1, - STR_TERMINATE | STR_CONVERT); + p = param+12; + p += clistr_push(cli, param+12, mask, -1, + STR_TERMINATE | STR_CONVERT); } else { setup = TRANSACT2_FINDNEXT; SSVAL(param,0,ff_dir_handle); @@ -214,10 +211,13 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, SSVAL(param,4,info_level); SIVAL(param,6,0); /* ff_resume_key */ SSVAL(param,10,8+4+2); /* continue + resume required + close on end */ - clistr_push(cli, param+12, mask, -1, - STR_TERMINATE | STR_CONVERT); + p = param+12; + p += clistr_push(cli, param+12, mask, -1, + STR_TERMINATE | STR_CONVERT); } + param_len = PTR_DIFF(p, param); + if (!cli_send_trans(cli, SMBtrans2, NULL, /* Name */ -1, 0, /* fid, flags */ |