diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-01-14 03:02:18 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-01-14 03:02:18 +0000 |
| commit | 42d9c734240574247cf3363a5d8ee67a17c668bc (patch) | |
| tree | be8848468501a75996f275b184a2a9326a7372e8 | |
| parent | f504cc4e10006f324bef9f3149d4099fba6ea732 (diff) | |
| download | samba-42d9c734240574247cf3363a5d8ee67a17c668bc.tar.gz samba-42d9c734240574247cf3363a5d8ee67a17c668bc.tar.bz2 samba-42d9c734240574247cf3363a5d8ee67a17c668bc.zip | |
merge alt_name patch from head
(This used to be commit 20ebdee36d5351731698bdef6602fc73a45b1651)
| -rw-r--r-- | source3/libsmb/clirap.c | 2 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index 792a3e7aa0..f8f840abaa 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -727,7 +727,7 @@ NTSTATUS cli_qpathinfo_alt_name(struct cli_state *cli, const char *fname, fstrin return NT_STATUS_INVALID_NETWORK_RESPONSE; } - clistr_pull(cli, alt_name, rdata+4, sizeof(fstring), len, 0); + clistr_pull(cli, alt_name, rdata+4, sizeof(fstring), len, STR_UNICODE); SAFE_FREE(rdata); SAFE_FREE(rparam); diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 872e33c832..b9956370c2 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1794,7 +1794,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, if(!mangle_is_8_3(short_name, True)) { mangle_map(short_name,True,True,SNUM(conn)); } - len = srvstr_push(outbuf, pdata+4, short_name, -1, STR_TERMINATE|STR_UPPER); + len = srvstr_push(outbuf, pdata+4, short_name, -1, STR_UNICODE); data_size = 4 + len; SIVAL(pdata,0,len); break; |