diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-05-25 15:34:06 +1000 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-31 15:10:33 +0200 |
| commit | 3b706865f6bae7a2b04590da160bda939a3bafe5 (patch) | |
| tree | 5b4f94158d44524bd2115a5cea4063dd278796ee /source3/smbd/seal.c | |
| parent | a950c6c60097af750d4348cb096fdacb342e9e71 (diff) | |
| download | samba-3b706865f6bae7a2b04590da160bda939a3bafe5.tar.gz samba-3b706865f6bae7a2b04590da160bda939a3bafe5.tar.bz2 samba-3b706865f6bae7a2b04590da160bda939a3bafe5.zip | |
s3:auth Make AUTH_NTLMSSP_STATE a private structure.
This makes it a little easier for it to writen in terms of GENSEC in future.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3/smbd/seal.c')
| -rw-r--r-- | source3/smbd/seal.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c index 700d7ea02e..4662507c90 100644 --- a/source3/smbd/seal.c +++ b/source3/smbd/seal.c @@ -85,7 +85,7 @@ static NTSTATUS make_auth_ntlmssp(struct smb_srv_trans_enc_ctx *ec) * We must remember to update the pointer copy for the common * functions after any auth_ntlmssp_start/auth_ntlmssp_end. */ - ec->es->s.ntlmssp_state = ec->auth_ntlmssp_state->ntlmssp_state; + ec->es->s.ntlmssp_state = auth_ntlmssp_get_ntlmssp_state(ec->auth_ntlmssp_state); return status; } @@ -710,8 +710,11 @@ static NTSTATUS check_enc_good(struct smb_srv_trans_enc_ctx *ec) } if (ec->es->smb_enc_type == SMB_TRANS_ENC_NTLM) { - if ((ec->es->s.ntlmssp_state->neg_flags & (NTLMSSP_NEGOTIATE_SIGN|NTLMSSP_NEGOTIATE_SEAL)) != - (NTLMSSP_NEGOTIATE_SIGN|NTLMSSP_NEGOTIATE_SEAL)) { + if (!auth_ntlmssp_negotiated_sign((ec->auth_ntlmssp_state))) { + return NT_STATUS_INVALID_PARAMETER; + } + + if (!auth_ntlmssp_negotiated_seal((ec->auth_ntlmssp_state))) { return NT_STATUS_INVALID_PARAMETER; } } |