summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-03-28 02:38:59 +0000
committerJeremy Allison <jra@samba.org>2000-03-28 02:38:59 +0000
commit676db02f1cd7cb81c58cbbdd3bc94da17dad5227 (patch)
tree294ee48a6aac5715eb37c68e0ef0a280e0b9ff75
parentf15ca0d9273d718534ba2fdd2ccd14ab90a95c8b (diff)
downloadsamba-676db02f1cd7cb81c58cbbdd3bc94da17dad5227.tar.gz
samba-676db02f1cd7cb81c58cbbdd3bc94da17dad5227.tar.xz
samba-676db02f1cd7cb81c58cbbdd3bc94da17dad5227.zip
Win2k will only accept volume labels in UNICODE. Fixed.... :-(.
Jeremy.
-rw-r--r--source/smbd/trans2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 38f2802df3f..e6ee65d101d 100644
--- a/source/smbd/trans2.c
+++ b/source/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",