diff options
| author | Jeremy Allison <jra@samba.org> | 2002-06-07 00:39:31 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-06-07 00:39:31 +0000 |
| commit | 89b647db2831ad1379e43fac84a36f9027931f02 (patch) | |
| tree | b96ed1658e0ad1a460e7a6887ba19281d55bd02a /source/libsmb | |
| parent | 4489a9259806b4708711f3610ea7858912ad99af (diff) | |
| download | samba-89b647db2831ad1379e43fac84a36f9027931f02.tar.gz samba-89b647db2831ad1379e43fac84a36f9027931f02.tar.xz samba-89b647db2831ad1379e43fac84a36f9027931f02.zip | |
Add more missing STR_CONVERT's.
Jeremy.
Diffstat (limited to 'source/libsmb')
| -rw-r--r-- | source/libsmb/clilist.c | 6 | ||||
| -rw-r--r-- | source/libsmb/clirap.c | 6 | ||||
| -rw-r--r-- | source/libsmb/clitrans.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/libsmb/clilist.c b/source/libsmb/clilist.c index 0c80044b68f..77ffe7b41b0 100644 --- a/source/libsmb/clilist.c +++ b/source/libsmb/clilist.c @@ -177,7 +177,7 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, SIVAL(param,8,0); p = param+12; p += clistr_push(cli, param+12, mask, -1, - STR_TERMINATE); + STR_TERMINATE|STR_CONVERT); } else { setup = TRANSACT2_FINDNEXT; SSVAL(param,0,ff_dir_handle); @@ -187,7 +187,7 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, SSVAL(param,10,8+4+2); /* continue + resume required + close on end */ p = param+12; p += clistr_push(cli, param+12, mask, -1, - STR_TERMINATE); + STR_TERMINATE|STR_CONVERT); } param_len = PTR_DIFF(p, param); @@ -369,7 +369,7 @@ int cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute, p = smb_buf(cli->outbuf); *p++ = 4; - p += clistr_push(cli, p, first?mask:"", -1, STR_TERMINATE); + p += clistr_push(cli, p, first?mask:"", -1, STR_TERMINATE|STR_CONVERT); *p++ = 5; if (first) { SSVAL(p,0,0); diff --git a/source/libsmb/clirap.c b/source/libsmb/clirap.c index 2f1423aa1a1..e0e5bc0c1f8 100644 --- a/source/libsmb/clirap.c +++ b/source/libsmb/clirap.c @@ -386,7 +386,7 @@ BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, memset(p, 0, 6); SSVAL(p, 0, SMB_INFO_STANDARD); p += 6; - p += clistr_push(cli, p, fname, sizeof(pstring)-6, STR_TERMINATE ); + p += clistr_push(cli, p, fname, sizeof(pstring)-6, STR_TERMINATE|STR_CONVERT ); param_len = PTR_DIFF(p, param); @@ -462,7 +462,7 @@ BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, memset(p, 0, 6); SSVAL(p, 0, SMB_QUERY_FILE_ALL_INFO); p += 6; - p += clistr_push(cli, p, fname, sizeof(pstring)-6, STR_TERMINATE ); + p += clistr_push(cli, p, fname, sizeof(pstring)-6, STR_TERMINATE|STR_CONVERT ); param_len = PTR_DIFF(p, param); @@ -649,7 +649,7 @@ NTSTATUS cli_qpathinfo_alt_name(struct cli_state *cli, const char *fname, fstrin memset(p, 0, 6); SSVAL(p, 0, SMB_QUERY_FILE_ALT_NAME_INFO); p += 6; - p += clistr_push(cli, p, fname, sizeof(pstring)-6, STR_TERMINATE); + p += clistr_push(cli, p, fname, sizeof(pstring)-6, STR_TERMINATE|STR_CONVERT); param_len = PTR_DIFF(p, param); diff --git a/source/libsmb/clitrans.c b/source/libsmb/clitrans.c index 96c041fa3be..bd8647421b2 100644 --- a/source/libsmb/clitrans.c +++ b/source/libsmb/clitrans.c @@ -46,12 +46,12 @@ BOOL cli_send_trans(struct cli_state *cli, int trans, memset(cli->outbuf,'\0',smb_size); set_message(cli->outbuf,14+lsetup,0,True); - SCVAL(cli->outbuf,smb_com,trans); + SCVAL(cli->outbuf,smb_com,trans); SSVAL(cli->outbuf,smb_tid, cli->cnum); cli_setup_packet(cli); if (pipe_name) { - pipe_name_len = clistr_push(cli, smb_buf(cli->outbuf), pipe_name, -1, STR_TERMINATE); + pipe_name_len = clistr_push(cli, smb_buf(cli->outbuf), pipe_name, -1, STR_TERMINATE|STR_CONVERT); } outparam = smb_buf(cli->outbuf)+(trans==SMBtrans ? pipe_name_len : 3); |