summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2002-09-28 15:01:58 +0000
committerVolker Lendecke <vlendec@samba.org>2002-09-28 15:01:58 +0000
commitca772ac1f41cbcb620e534b8d2c916e0e3f16808 (patch)
tree61fe3e17a97ff708bf5680a6db0737cc154e6961
parent4e73790e3a20be5c7bf8fa3b62d9d41ba246b59c (diff)
downloadsamba-ca772ac1f41cbcb620e534b8d2c916e0e3f16808.tar.gz
samba-ca772ac1f41cbcb620e534b8d2c916e0e3f16808.tar.bz2
samba-ca772ac1f41cbcb620e534b8d2c916e0e3f16808.zip
Ok, hopefully final fix for this one. abartlet told a bit about the
history. Volker (This used to be commit d47aff38db23815a48e64718ecb6c957101ecdac)
-rw-r--r--source3/libsmb/cliconnect.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 695c6506b5..3951e3c776 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -185,12 +185,6 @@ static BOOL cli_session_setup_plaintext(struct cli_state *cli, char *user,
{
uint32 capabilities = cli_session_setup_capabilities(cli);
char *p;
- int push_flags = STR_TERMINATE;
-
- if (capabilities & CAP_UNICODE)
- push_flags |= STR_UNICODE;
- else
- push_flags |= STR_ASCII;
set_message(cli->outbuf,13,0,True);
SCVAL(cli->outbuf,smb_com,SMBsesssetupX);
@@ -204,7 +198,7 @@ static BOOL cli_session_setup_plaintext(struct cli_state *cli, char *user,
SSVAL(cli->outbuf,smb_vwv8,0);
SIVAL(cli->outbuf,smb_vwv11,capabilities);
p = smb_buf(cli->outbuf);
- p += clistr_push(cli, p, pass, -1, push_flags); /* password */
+ p += clistr_push(cli, p, pass, -1, STR_TERMINATE); /* password */
SSVAL(cli->outbuf,smb_vwv7,PTR_DIFF(p, smb_buf(cli->outbuf)));
p += clistr_push(cli, p, user, -1, STR_TERMINATE); /* username */
p += clistr_push(cli, p, workgroup, -1, STR_TERMINATE); /* workgroup */