sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3: libcli: Rename smb_signing_is_mandatory() -> smb1_signing_is_mandatory()

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: David Mulder <dmulder@samba.org>
This commit is contained in:
Jeremy Allison 2022-03-07 19:36:25 -08:00 committed by David Mulder
parent e42fc9bc24
commit 79633b42d6
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcli/smb/smb_signing.c
View File

@ -444,7 +444,7 @@ bool smb1_signing_is_desired(struct smb1_signing_state *si)
return si->desired;
}
bool smb_signing_is_mandatory(struct smb1_signing_state *si)
bool smb1_signing_is_mandatory(struct smb1_signing_state *si)
{
return si->mandatory;
}

2
libcli/smb/smb_signing.h
View File

@ -47,7 +47,7 @@ bool smb1_signing_activate(struct smb1_signing_state *si,
const DATA_BLOB response);
bool smb1_signing_is_active(struct smb1_signing_state *si);
bool smb1_signing_is_desired(struct smb1_signing_state *si);
bool smb_signing_is_mandatory(struct smb1_signing_state *si);
bool smb1_signing_is_mandatory(struct smb1_signing_state *si);
bool smb_signing_set_negotiated(struct smb1_signing_state *si,
bool allowed, bool mandatory);
bool smb_signing_is_negotiated(struct smb1_signing_state *si);

4
source3/smbd/negprot.c
View File

@ -344,7 +344,7 @@ static NTSTATUS reply_nt1(struct smb_request *req, uint16_t choice)
}
signing_desired = smb1_signing_is_desired(xconn->smb1.signing_state);
signing_required = smb_signing_is_mandatory(xconn->smb1.signing_state);
signing_required = smb1_signing_is_mandatory(xconn->smb1.signing_state);
if (signing_desired) {
secword |= NEGOTIATE_SECURITY_SIGNATURES_ENABLED;
@ -781,7 +781,7 @@ void reply_negprot(struct smb_request *req)
xconn->smb1.negprot.done = true;
/* We always have xconn->smb1.signing_state also for >= SMB2_02 */
signing_required = smb_signing_is_mandatory(xconn->smb1.signing_state);
signing_required = smb1_signing_is_mandatory(xconn->smb1.signing_state);
if (signing_required && (chosen_level < PROTOCOL_NT1)) {
exit_server_cleanly("SMB signing is required and "
"client negotiated a downlevel protocol");

2
source3/smbd/sesssetup.c
View File

@ -597,7 +597,7 @@ void reply_sesssetup_and_X(struct smb_request *req)
struct smbd_server_connection *sconn = req->sconn;
bool doencrypt = xconn->smb1.negprot.encrypted_passwords;
bool signing_allowed = false;
bool signing_mandatory = smb_signing_is_mandatory(
bool signing_mandatory = smb1_signing_is_mandatory(
xconn->smb1.signing_state);
START_PROFILE(SMBsesssetupX);

2
source3/smbd/signing.c
View File

@ -301,7 +301,7 @@ void srv_set_signing(struct smbXsrv_connection *conn,
return;
negotiated = smb_signing_is_negotiated(conn->smb1.signing_state);
mandatory = smb_signing_is_mandatory(conn->smb1.signing_state);
mandatory = smb1_signing_is_mandatory(conn->smb1.signing_state);
if (!negotiated && !mandatory) {
DEBUG(5,("srv_set_signing: signing negotiated = %u, "