summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-01-14 02:51:37 +0000
committerAndrew Tridgell <tridge@samba.org>2003-01-14 02:51:37 +0000
commit6d030555a113ea8b6bfac51d90dce6cd76719caa (patch)
tree7c1986c9edb1bda59b07ac05effac18b441b27ad
parentcfe3a1731c0cc2d66781909c9b12a111455edd37 (diff)
downloadsamba-6d030555a113ea8b6bfac51d90dce6cd76719caa.tar.gz
samba-6d030555a113ea8b6bfac51d90dce6cd76719caa.tar.bz2
samba-6d030555a113ea8b6bfac51d90dce6cd76719caa.zip
query_alt_name takes a forced unicode string in win2000. It is not
null terminated. Thanks to Metze for finding this. (This used to be commit e4ce26332b8f876e25ff9baf06d4767a473e2676)
-rw-r--r--source3/libsmb/clirap.c2
-rw-r--r--source3/smbd/trans2.c2
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;