diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-05-26 12:48:58 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-06-03 17:54:37 +0200 |
| commit | e16e7146b378e8e89bf25adc66d806bac7feaeb6 (patch) | |
| tree | 3749acfaa0e0121050f6ff8cfebb3e60e37533ac /source3/smbd/sesssetup.c | |
| parent | f20ded603b488b4eaca8b4bf1009e61ead851f85 (diff) | |
| download | samba-e16e7146b378e8e89bf25adc66d806bac7feaeb6.tar.gz samba-e16e7146b378e8e89bf25adc66d806bac7feaeb6.tar.bz2 samba-e16e7146b378e8e89bf25adc66d806bac7feaeb6.zip | |
s3:smbd: move negprot related globals to struct smbd_server_connection
metze
Diffstat (limited to 'source3/smbd/sesssetup.c')
| -rw-r--r-- | source3/smbd/sesssetup.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index e82de0ae98..8a517994cc 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -1388,8 +1388,9 @@ void reply_sesssetup_and_X(struct smb_request *req) uint16 smb_flag2 = req->flags2; NTSTATUS nt_status; + struct smbd_server_connection *sconn = smbd_server_conn; - bool doencrypt = global_encrypted_passwords_negotiated; + bool doencrypt = sconn->smb1.negprot.encrypted_passwords; START_PROFILE(SMBsesssetupX); @@ -1404,7 +1405,7 @@ void reply_sesssetup_and_X(struct smb_request *req) if (req->wct == 12 && (req->flags2 & FLAGS2_EXTENDED_SECURITY)) { - if (!global_spnego_negotiated) { + if (!sconn->smb1.negprot.spnego) { DEBUG(0,("reply_sesssetup_and_X: Rejecting attempt " "at SPNEGO session setup when it was not " "negotiated.\n")); @@ -1619,7 +1620,7 @@ void reply_sesssetup_and_X(struct smb_request *req) domain, user, get_remote_machine_name())); if (*user) { - if (global_spnego_negotiated) { + if (sconn->smb1.negprot.spnego) { /* This has to be here, because this is a perfectly * valid behaviour for guest logons :-( */ @@ -1660,7 +1661,9 @@ void reply_sesssetup_and_X(struct smb_request *req) nt_status = check_guest_password(&server_info); } else if (doencrypt) { - if (!negprot_global_auth_context) { + struct auth_context *negprot_auth_context = NULL; + negprot_auth_context = sconn->smb1.negprot.auth_context; + if (!negprot_auth_context) { DEBUG(0, ("reply_sesssetup_and_X: Attempted encrypted " "session setup without negprot denied!\n")); reply_nterror(req, nt_status_squash( @@ -1672,8 +1675,8 @@ void reply_sesssetup_and_X(struct smb_request *req) domain, lm_resp, nt_resp); if (NT_STATUS_IS_OK(nt_status)) { - nt_status = negprot_global_auth_context->check_ntlm_password( - negprot_global_auth_context, + nt_status = negprot_auth_context->check_ntlm_password( + negprot_auth_context, user_info, &server_info); } |