sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

s3-ntlmssp Remove auth_ntlmssp_negotiated_sign() and auth_ntlmssp_negotiated_seal()

Browse Source 
We now just call the gensec_have_feature() directly.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andrew Bartlett 2011-10-18 21:20:01 +11:00 committed by Stefan Metzmacher
parent 083025ccd5
commit 487545d48f
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/ntlmssp_wrap.h
View File

@ -60,8 +60,6 @@ NTSTATUS auth_ntlmssp_unseal_packet(struct auth_ntlmssp_state *ans,
const uint8_t *whole_pdu,
size_t pdu_length,
const DATA_BLOB *sig);
bool auth_ntlmssp_negotiated_sign(struct auth_ntlmssp_state *ans);
bool auth_ntlmssp_negotiated_seal(struct auth_ntlmssp_state *ans);
NTSTATUS auth_ntlmssp_set_username(struct auth_ntlmssp_state *ans,
const char *user);
NTSTATUS auth_ntlmssp_set_domain(struct auth_ntlmssp_state *ans,

10
source3/libsmb/ntlmssp_wrap.c
View File

@ -72,16 +72,6 @@ NTSTATUS auth_ntlmssp_unseal_packet(struct auth_ntlmssp_state *ans,
data, length, whole_pdu, pdu_length, sig);
}
bool auth_ntlmssp_negotiated_sign(struct auth_ntlmssp_state *ans)
{
return gensec_have_feature(ans->gensec_security, GENSEC_FEATURE_SIGN);
}
bool auth_ntlmssp_negotiated_seal(struct auth_ntlmssp_state *ans)
{
return gensec_have_feature(ans->gensec_security, GENSEC_FEATURE_SEAL);
}
NTSTATUS auth_ntlmssp_set_username(struct auth_ntlmssp_state *ans,
const char *user)
{

4
source3/rpc_server/dcesrv_ntlmssp.c
View File

@ -97,13 +97,13 @@ NTSTATUS ntlmssp_server_step(struct auth_ntlmssp_state *ctx,
NTSTATUS ntlmssp_server_check_flags(struct auth_ntlmssp_state *ctx,
bool do_sign, bool do_seal)
{
if (do_sign && !auth_ntlmssp_negotiated_sign(ctx)) {
if (do_sign && !gensec_have_feature(ctx->gensec_security, GENSEC_FEATURE_SIGN)) {
DEBUG(1, (__location__ "Integrity was requested but client "
"failed to negotiate signing.\n"));
return NT_STATUS_ACCESS_DENIED;
}
if (do_seal && !auth_ntlmssp_negotiated_seal(ctx)) {
if (do_seal && !gensec_have_feature(ctx->gensec_security, GENSEC_FEATURE_SEAL)) {
DEBUG(1, (__location__ "Privacy was requested but client "
"failed to negotiate sealing.\n"));
return NT_STATUS_ACCESS_DENIED;

4
source3/smbd/seal.c
View File

@ -761,11 +761,11 @@ static NTSTATUS check_enc_good(struct smb_srv_trans_enc_ctx *ec)
}
if (ec->es->smb_enc_type == SMB_TRANS_ENC_NTLM) {
if (!auth_ntlmssp_negotiated_sign((ec->auth_ntlmssp_state))) {
if (!gensec_have_feature(ec->auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SIGN)) {
return NT_STATUS_INVALID_PARAMETER;
}
if (!auth_ntlmssp_negotiated_seal((ec->auth_ntlmssp_state))) {
if (!gensec_have_feature(ec->auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SEAL)) {
return NT_STATUS_INVALID_PARAMETER;
}
}