diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-02-20 10:11:40 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-02-20 10:11:40 +0000 |
| commit | c565c98723f1fab04d47ae6076d742c8ee2dcb49 (patch) | |
| tree | 6666eba5ae7ab3feb4d18133df65d4cac4675908 /source3/libsmb/clitrans.c | |
| parent | 6492d6b2f6a2743f5e794447911cbbba7e031d5d (diff) | |
| download | samba-c565c98723f1fab04d47ae6076d742c8ee2dcb49.tar.gz samba-c565c98723f1fab04d47ae6076d742c8ee2dcb49.tar.bz2 samba-c565c98723f1fab04d47ae6076d742c8ee2dcb49.zip | |
pipe opening now works with unicode
(This used to be commit ba3ce3404e1cd2e9da3ba1708f6fc8a12c085ef2)
Diffstat (limited to 'source3/libsmb/clitrans.c')
| -rw-r--r-- | source3/libsmb/clitrans.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c index 5cd6ae30ce..3afca997cc 100644 --- a/source3/libsmb/clitrans.c +++ b/source3/libsmb/clitrans.c @@ -28,7 +28,7 @@ send a SMB trans or trans2 request ****************************************************************************/ BOOL cli_send_trans(struct cli_state *cli, int trans, - char *name, int pipe_name_len, + char *pipe_name, int fid, int flags, uint16 *setup, int lsetup, int msetup, char *param, int lparam, int mparam, @@ -39,6 +39,7 @@ BOOL cli_send_trans(struct cli_state *cli, int trans, int tot_data=0,tot_param=0; char *outdata,*outparam; char *p; + int pipe_name_len=0; this_lparam = MIN(lparam,cli->max_xmit - (500+lsetup*2)); /* hack */ this_ldata = MIN(ldata,cli->max_xmit - (500+lsetup*2+this_lparam)); @@ -49,7 +50,13 @@ BOOL cli_send_trans(struct cli_state *cli, int trans, SSVAL(cli->outbuf,smb_tid, cli->cnum); cli_setup_packet(cli); - outparam = smb_buf(cli->outbuf)+(trans==SMBtrans ? pipe_name_len+1 : 3); + if (pipe_name) { + pipe_name_len = clistr_push_size(cli, smb_buf(cli->outbuf), + pipe_name, -1, + CLISTR_TERMINATE); + } + + outparam = smb_buf(cli->outbuf)+(trans==SMBtrans ? pipe_name_len : 3); outdata = outparam+this_lparam; /* primary request */ @@ -69,7 +76,7 @@ BOOL cli_send_trans(struct cli_state *cli, int trans, SSVAL(cli->outbuf,smb_setup+i*2,setup[i]); p = smb_buf(cli->outbuf); if (trans==SMBtrans) { - memcpy(p,name, pipe_name_len + 1); /* name[] */ + clistr_push(cli, p, pipe_name, -1, CLISTR_TERMINATE); } else { *p++ = 0; /* put in a null smb_name */ *p++ = 'D'; *p++ = ' '; /* observed in OS/2 */ |