From 7bd8ad3c92839b07fd5f5a3ed0f4eb4c571c24ac Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 26 Aug 2007 10:50:39 +0000 Subject: r24661: 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 (This used to be commit d82f35448763eacd564836f34c9aa450b15ea582) --- source3/smbd/sesssetup.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source3/smbd/sesssetup.c') diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 4405b69475..0cfe672a82 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -259,7 +259,7 @@ static void reply_spnego_kerberos(connection_struct *conn, 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 @@ static void reply_spnego_ntlmssp(connection_struct *conn, 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 @@ void reply_sesssetup_and_X(connection_struct *conn, struct smb_request *req) 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, -- cgit