svn commit: samba r10598 - in branches/SAMBA_4_0/source/libcli/smb_composite: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-09-29 00:28:46 +0000 (Thu, 29 Sep 2005)
New Revision: 10598

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

Log:
Factor out common code, in preperation for a move elsewhere.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/smb_composite/sesssetup.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/smb_composite/sesssetup.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb_composite/sesssetup.c	2005-09-29 00:03:43 UTC (rev 10597)
+++ branches/SAMBA_4_0/source/libcli/smb_composite/sesssetup.c	2005-09-29 00:28:46 UTC (rev 10598)
@@ -199,15 +199,10 @@
 				return NT_STATUS_NO_MEMORY;
 			}
 			data_blob_free(&names_blob);
+			data_blob_free(&lmv2_session_key);
 			state->setup.nt1.in.password1 = lmv2_response;
 			state->setup.nt1.in.password2 = ntlmv2_response;
 			
-			smbcli_transport_simple_set_signing(session->transport, session_key, 
-							    state->setup.nt1.in.password2);
-			set_user_session_key(session, &session_key);
-			
-			data_blob_free(&lmv2_session_key);
-			data_blob_free(&session_key);
 		} else {
 
 			state->setup.nt1.in.password2 = nt_blob(state, nt_hash,
@@ -222,13 +217,14 @@
 
 			session_key = data_blob_talloc(session, NULL, 16);
 			SMBsesskeygen_ntv1(nt_hash->hash, session_key.data);
-			smbcli_transport_simple_set_signing(session->transport, session_key, 
-							    state->setup.nt1.in.password2);
-			set_user_session_key(session, &session_key);
-			
-			data_blob_free(&session_key);
 		}
 
+		smbcli_transport_simple_set_signing(session->transport, session_key, 
+						    state->setup.nt1.in.password2);
+		set_user_session_key(session, &session_key);
+		
+		data_blob_free(&session_key);
+
 	} else if (lp_client_plaintext_auth()) {
 		state->setup.nt1.in.password1 = data_blob_talloc(state, password, strlen(password));
 		state->setup.nt1.in.password2 = data_blob(NULL, 0);