diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-02-21 03:40:20 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-02-21 03:40:20 +0000 |
| commit | a8ab9840786b8376283743de8eef861d382b3171 (patch) | |
| tree | b0724235c8223e11e1287f0b542bf9f2bd28ef1e /source3/libsmb/cliconnect.c | |
| parent | 518f2fc391266c2f9b9cfc8b485a8e57ce359be8 (diff) | |
| download | samba-a8ab9840786b8376283743de8eef861d382b3171.tar.gz samba-a8ab9840786b8376283743de8eef861d382b3171.tar.bz2 samba-a8ab9840786b8376283743de8eef861d382b3171.zip | |
the unicode conversion of our client code is complete enough to be
enabled by default
you can disable it by setting the environment variable CLI_FORCE_ASCII
(This used to be commit 4d59c08c5e6f54c0d6ced7650750cb987e77b6c9)
Diffstat (limited to 'source3/libsmb/cliconnect.c')
| -rw-r--r-- | source3/libsmb/cliconnect.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 4a957a9ccd..d572c0f7d7 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -144,10 +144,10 @@ BOOL cli_session_setup(struct cli_state *cli, uint32 capabilities; capabilities = CAP_NT_SMBS; - if (cli->use_level_II_oplocks) + if (cli->use_level_II_oplocks) { capabilities |= CAP_LEVEL_II_OPLOCKS; - if (getenv("USE_UNICODE") && - (cli->capabilities & CAP_UNICODE)) { + } + if (cli->capabilities & CAP_UNICODE) { capabilities |= CAP_UNICODE; } set_message(cli->outbuf,13,0,True); @@ -453,8 +453,10 @@ BOOL cli_negprot(struct cli_state *cli) cli->max_xmit = MIN(cli->max_xmit, CLI_BUFFER_SIZE); - /* this ensures cli_use_unicode is setup - delete this call later (tridge) */ - cli_setup_packet(cli); + /* a way to force ascii SMB */ + if (getenv("CLI_FORCE_ASCII")) { + cli->capabilities &= ~CAP_UNICODE; + } return True; } |