sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

reading in smb server domain name from SMBnegprot response

Browse Source 
(This used to be commit 25025f4505)
This commit is contained in:
Luke Leighton
1999-09-16 22:46:45 +00:00
parent b9b4c1d563
commit 701f9ed2c9
3 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source3/libsmb/clientgen.c
View File

@ -2400,7 +2400,10 @@ BOOL cli_negprot(struct cli_state *cli)
cli->protocol = prots[SVAL(cli->inbuf,smb_vwv0)].prot; cli->protocol = prots[SVAL(cli->inbuf,smb_vwv0)].prot;
if (cli->protocol >= PROTOCOL_NT1) { if (cli->protocol >= PROTOCOL_NT1)
{
char *buf = smb_buf(cli->inbuf);
int bcc = SVAL(cli->inbuf,smb_vwv+2*(CVAL(cli->inbuf,smb_wct)));
/* NT protocol */ /* NT protocol */
cli->sec_mode = CVAL(cli->inbuf,smb_vwv1); cli->sec_mode = CVAL(cli->inbuf,smb_vwv1);
cli->max_mux = SVAL(cli->inbuf, smb_vwv1+1); cli->max_mux = SVAL(cli->inbuf, smb_vwv1+1);
@ -2409,13 +2412,26 @@ BOOL cli_negprot(struct cli_state *cli)
cli->serverzone = SVALS(cli->inbuf,smb_vwv15+1)*60; cli->serverzone = SVALS(cli->inbuf,smb_vwv15+1)*60;
/* this time arrives in real GMT */ /* this time arrives in real GMT */
cli->servertime = interpret_long_date(cli->inbuf+smb_vwv11+1); cli->servertime = interpret_long_date(cli->inbuf+smb_vwv11+1);
memcpy(cli->cryptkey,smb_buf(cli->inbuf),8); memcpy(cli->cryptkey, buf,8);
if (bcc > 8)
{
unibuf_to_ascii(cli->server_domain, buf+8,
sizeof(cli->server_domain));
}
else
{
cli->server_domain[0] = 0;
}
cli->capabilities = IVAL(cli->inbuf,smb_vwv9+1); cli->capabilities = IVAL(cli->inbuf,smb_vwv9+1);
if (cli->capabilities & CAP_RAW_MODE) { if (cli->capabilities & CAP_RAW_MODE) {
cli->readbraw_supported = True; cli->readbraw_supported = True;
cli->writebraw_supported = True; cli->writebraw_supported = True;
} }
} else if (cli->protocol >= PROTOCOL_LANMAN1) { DEBUG(5,("server's domain: %s bcc: %d\n",
cli->server_domain, bcc));
}
else if (cli->protocol >= PROTOCOL_LANMAN1)
{
cli->sec_mode = SVAL(cli->inbuf,smb_vwv1); cli->sec_mode = SVAL(cli->inbuf,smb_vwv1);
cli->max_xmit = SVAL(cli->inbuf,smb_vwv2); cli->max_xmit = SVAL(cli->inbuf,smb_vwv2);
cli->sesskey = IVAL(cli->inbuf,smb_vwv6); cli->sesskey = IVAL(cli->inbuf,smb_vwv6);
@ -2834,6 +2850,12 @@ BOOL cli_establish_connection(struct cli_state *cli,
return False; return False;
} }
if (cli->domain[0] == 0)
{
safe_strcpy(cli->domain, cli->server_domain,
sizeof(cli->domain));
}
if (cli->pwd.cleartext || cli->pwd.null_pwd) if (cli->pwd.cleartext || cli->pwd.null_pwd)
{ {
fstring passwd, ntpasswd; fstring passwd, ntpasswd;
@ -2885,13 +2907,12 @@ BOOL cli_establish_connection(struct cli_state *cli,
unsigned char lm_sess_pwd[24]; unsigned char lm_sess_pwd[24];
unsigned char nt_sess_pwd[128]; unsigned char nt_sess_pwd[128];
size_t nt_sess_pwd_len; size_t nt_sess_pwd_len;
extern pstring global_myname;
if (cli->use_ntlmv2 != False) if (cli->use_ntlmv2 != False)
{ {
DEBUG(10,("cli_establish_connection: NTLMv2\n")); DEBUG(10,("cli_establish_connection: NTLMv2\n"));
pwd_make_lm_nt_owf2(&(cli->pwd), cli->cryptkey, pwd_make_lm_nt_owf2(&(cli->pwd), cli->cryptkey,
cli->user_name, global_myname, cli->domain); cli->user_name, calling->name, cli->domain);
} }
else else
{ {

2
source3/rpcclient/rpcclient.c
View File

@ -849,8 +849,6 @@ char *complete_cmd_null(char *text, int state)
codepage_initialise(lp_client_code_page()); codepage_initialise(lp_client_code_page());
if (*smb_cli->domain == 0) pstrcpy(smb_cli->domain,lp_workgroup());
load_interfaces(); load_interfaces();
if (cli_action == CLIENT_IPC) if (cli_action == CLIENT_IPC)

7
source3/smbd/negprot.c
View File

@ -218,12 +218,13 @@ static int reply_nt1(char *outbuf)
if (doencrypt) secword |= 2; if (doencrypt) secword |= 2;
/* decide where (if) to put the encryption challenge, and /* decide where (if) to put the encryption challenge, and
follow it with the OEM'd domain name follow it with the OEM'd domain name in Unicode.
*/ */
data_len = crypt_len + strlen(global_myworkgroup) + 1; data_len = crypt_len + (strlen(global_myworkgroup)+1)*2;
set_message(outbuf,17,data_len,True); set_message(outbuf,17,data_len,True);
pstrcpy(smb_buf(outbuf)+crypt_len, global_myworkgroup); ascii_to_unibuf(smb_buf(outbuf)+crypt_len, global_myworkgroup,
(strlen(global_myworkgroup)+1)*2);
CVAL(outbuf,smb_vwv1) = secword; CVAL(outbuf,smb_vwv1) = secword;
SSVALS(outbuf,smb_vwv16+1,crypt_len); SSVALS(outbuf,smb_vwv16+1,crypt_len);