sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-30 20:23:49 +03:00
Code Activity

returned cli_session_setup to previous behaviour. added a couple of

Browse Source 
validation checks and also added capability to send plaintext passwords.
send "ntpasslen" of zero to do this.  sending same plaintext password
for pass and ntpass arguments will result in previous behaviour of
encrypting password if server supports it.
This commit is contained in:
Luke Leighton
-
parent f4dd8f6b56
commit 17f4c5a785
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/libsmb/clientgen.c
View File

@@ -713,25 +713,40 @@ BOOL cli_session_setup(struct cli_state *cli,
fstrcpy(ntpword, "");
ntpasslen=1;
}
else if (((passlen == 0) || (passlen == 1)) && (pass[0] == '\0'))
else if ((passlen == 0 || passlen == 1) && (pass[0] == '\0'))
{
/* Null session connect. */
pword[0] = '\0';
pword [0] = '\0';
ntpword[0] = '\0';
}
else if (passlen == 24 && ntpasslen == 24)
{
/* encrypted password send, implicit from 24-byte lengths */
memcpy(pword, pass, 24);
memcpy(ntpword, ntpass, 24);
if (IS_BITS_SET_ALL(cli->sec_mode, 2))
{
/* encrypted password, implicit from 24-byte lengths */
memcpy(pword , pass , 24);
memcpy(ntpword, ntpass, 24);
}
else
{
DEBUG(0,("cli_session_setup: encrypted passwords not supported by server\n"));
return False;
}
}
else
else if (ntpasslen == 0 || !IS_BITS_SET_ALL(cli->sec_mode, 2))
{
/* plain-text password send */
/* plain-text password: server doesn't support encrypted. */
fstrcpy(pword, pass);
fstrcpy(ntpword, "");
ntpasslen = 0;
}
else /* passlen != 0 && ntpasslen != 0 && server supports encryption */
{
/* plain-text password requesting to be encrypted */
uchar *key = (uchar *)cli->cryptkey;
SMBencrypt ((uchar *)pass , key,(uchar *)pword );
SMBNTencrypt((uchar *)ntpass, key,(uchar *)ntpword);
}
/* send a session setup command */
bzero(cli->outbuf,smb_size);