svn commit: samba r1738 - branches/SAMBA_4_0/source/libcli/raw

[tridge at samba.org]

Author: tridge
Date: 2004-08-11 21:09:36 +0000 (Wed, 11 Aug 2004)
New Revision: 1738
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=1738&nolog=1
Log:
honor the "unicode=yes/no" option in the SMB client library

Modified:
   branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c

Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c	2004-08-11 21:06:11 UTC (rev 1737)
+++ branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c	2004-08-11 21:09:36 UTC (rev 1738)
@@ -53,7 +53,9 @@
 	}
 
 	flags2 |= FLAGS2_32_BIT_ERROR_CODES;
-	flags2 |= FLAGS2_UNICODE_STRINGS;
+	if (lp_unicode()) {
+		flags2 |= FLAGS2_UNICODE_STRINGS;
+	}
 	flags2 |= FLAGS2_EXTENDED_ATTRIBUTES;
 	flags2 |= FLAGS2_LONG_PATH_COMPONENTS;
 	flags2 |= FLAGS2_IS_LONG_NAME;
@@ -172,7 +174,7 @@
 	}
 
 	/* a way to force ascii SMB */
-	if (getenv("SMBCLI_FORCE_ASCII")) {
+	if (!lp_unicode() || getenv("SMBCLI_FORCE_ASCII")) {
 		transport->negotiate.capabilities &= ~CAP_UNICODE;
 	}