svn commit: samba r24661 - in branches/SAMBA_3_2/source/smbd: .

vlendec at samba.org vlendec at samba.org
Sun Aug 26 10:50:40 GMT 2007


Author: vlendec
Date: 2007-08-26 10:50:39 +0000 (Sun, 26 Aug 2007)
New Revision: 24661

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

Log:
Fix some obvious diffs between 3_2 and 3_2_0

Jeremy, there are two remaining diffs in sesssetup.c which I don't really
know which one is right. Can you take a look?

Thanks,

Volker

Modified:
   branches/SAMBA_3_2/source/smbd/sesssetup.c


Changeset:
Modified: branches/SAMBA_3_2/source/smbd/sesssetup.c
===================================================================
--- branches/SAMBA_3_2/source/smbd/sesssetup.c	2007-08-25 20:10:15 UTC (rev 24660)
+++ branches/SAMBA_3_2/source/smbd/sesssetup.c	2007-08-26 10:50:39 UTC (rev 24661)
@@ -259,7 +259,7 @@
 	fstring netbios_domain_name;
 	struct passwd *pw;
 	fstring user;
-	int sess_vuid = SVAL(req->inbuf, smb_uid);
+	int sess_vuid = req->vuid;
 	NTSTATUS ret = NT_STATUS_OK;
 	PAC_DATA *pac_data;
 	DATA_BLOB ap_rep, ap_rep_wrapped, response;
@@ -680,7 +680,8 @@
 			SSVAL(req->outbuf,smb_vwv2,1);
 		}
 
-		sessionsetup_start_signing_engine(server_info, req->inbuf);
+		sessionsetup_start_signing_engine(server_info,
+						  (uint8 *)req->inbuf);
 	}
 
   out:
@@ -1720,9 +1721,10 @@
 			data_blob_free(&nt_resp);
 			data_blob_free(&lm_resp);
 			data_blob_free(&session_key);
-			END_PROFILE(SMBsesssetupX);
 			reply_nterror(req, nt_status_squash(
 					      NT_STATUS_LOGON_FAILURE));
+			END_PROFILE(SMBsesssetupX);
+			return;
 		}
 		/* register_existing_vuid keeps the server info */
 		sess_vuid = register_existing_vuid(sess_vuid,



More information about the samba-cvs mailing list