svn commit: samba r5536 - in branches/SAMBA_3_0/source/rpc_parse: .

abartlet at samba.org abartlet at samba.org
Thu Feb 24 03:45:10 GMT 2005


Author: abartlet
Date: 2005-02-24 03:45:09 +0000 (Thu, 24 Feb 2005)
New Revision: 5536

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5536

Log:
Avoid intermediate copy of NT and LM responses in NETLOGON client.

This copy was length-limited, which broke when the NTLMv2 response was
more than 128 bytes in length.

Andrew Bartlett

Modified:
   branches/SAMBA_3_0/source/rpc_parse/parse_net.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_parse/parse_net.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_net.c	2005-02-24 02:19:17 UTC (rev 5535)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_net.c	2005-02-24 03:45:09 UTC (rev 5536)
@@ -1174,28 +1174,14 @@
 		   const uchar * lm_chal_resp, size_t lm_chal_resp_len,
 		   const uchar * nt_chal_resp, size_t nt_chal_resp_len)
 {
-	unsigned char lm_owf[24];
-	unsigned char nt_owf[128];
 
 	DEBUG(5,("init_id_info2: %d\n", __LINE__));
 
 	id->ptr_id_info2 = 1;
 
-
 	id->param_ctrl = param_ctrl;
 	init_logon_id(&id->logon_id, log_id_low, log_id_high);
 
-	if (nt_chal_resp) {
-		/* oops.  can only send what-ever-it-is direct */
-		memcpy(nt_owf, nt_chal_resp, MIN(sizeof(nt_owf), nt_chal_resp_len));
-		nt_chal_resp = nt_owf;
-	}
-	if (lm_chal_resp) {
-		/* oops.  can only send what-ever-it-is direct */
-		memcpy(lm_owf, lm_chal_resp, MIN(sizeof(lm_owf), lm_chal_resp_len));
-		lm_chal_resp = lm_owf;
-	}
-
 	memcpy(id->lm_chal, lm_challenge, sizeof(id->lm_chal));
 	init_str_hdr(&id->hdr_nt_chal_resp, nt_chal_resp_len, nt_chal_resp_len, (nt_chal_resp != NULL) ? 1 : 0);
 	init_str_hdr(&id->hdr_lm_chal_resp, lm_chal_resp_len, lm_chal_resp_len, (lm_chal_resp != NULL) ? 1 : 0);



More information about the samba-cvs mailing list