diff options
author | Jeremy Allison <jra@samba.org> | 2000-03-28 02:38:59 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2000-03-28 02:38:59 +0000 |
commit | b546035ba8b29188e249aaa55d140b1b93304dd4 (patch) | |
tree | 4447375ee95dd019588b82f18a181b7667affa0e | |
parent | aaa8aadd35dcdba542bda897bfe6c55c1567714b (diff) | |
download | samba-b546035ba8b29188e249aaa55d140b1b93304dd4.tar.gz samba-b546035ba8b29188e249aaa55d140b1b93304dd4.tar.bz2 samba-b546035ba8b29188e249aaa55d140b1b93304dd4.zip |
Win2k will only accept volume labels in UNICODE. Fixed.... :-(.
Jeremy.
(This used to be commit 676db02f1cd7cb81c58cbbdd3bc94da17dad5227)
-rw-r--r-- | source3/smbd/trans2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 38f2802df3..e6ee65d101 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1200,7 +1200,7 @@ static int call_trans2qfsinfo(connection_struct *conn, /* NT4 always serves this up as unicode but expects it to be * delivered as ascii! (tridge && JRA) */ - if (global_client_caps & CAP_NT_SMBS) { + if ((get_remote_arch() != RA_WIN2K) && (global_client_caps & CAP_NT_SMBS)) { data_len = 18 + strlen(vname); SIVAL(pdata,12,strlen(vname)); pstrcpy(pdata+18,vname); @@ -1208,6 +1208,7 @@ static int call_trans2qfsinfo(connection_struct *conn, data_len = 18 + 2*strlen(vname); SIVAL(pdata,12,strlen(vname)*2); dos_PutUniCode(pdata+18,unix_to_dos(vname,False),sizeof(pstring), False); + SSVAL(outbuf,smb_flg2,SVAL(outbuf,smb_flg2)|FLAGS2_UNICODE_STRINGS); } DEBUG(5,("call_trans2qfsinfo : SMB_QUERY_FS_VOLUME_INFO namelen = %d, vol = %s\n", |