From: Jeremy Allison Date: Tue, 8 Mar 2022 03:34:42 +0000 (-0800) Subject: s3: libcli: Rename smb_signing_is_desired() -> smb1_signing_is_desired() X-Git-Tag: tevent-0.12.0~518 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e42fc9bc24deb288fad14c99bcf5a63435c5cd83;p=thirdparty%2Fsamba.git s3: libcli: Rename smb_signing_is_desired() -> smb1_signing_is_desired() Signed-off-by: Jeremy Allison Signed-off-by: David Mulder --- diff --git a/libcli/smb/smb_signing.c b/libcli/smb/smb_signing.c index 7032776bd0e..6b887b3627d 100644 --- a/libcli/smb/smb_signing.c +++ b/libcli/smb/smb_signing.c @@ -439,7 +439,7 @@ bool smb1_signing_is_active(struct smb1_signing_state *si) return si->active; } -bool smb_signing_is_desired(struct smb1_signing_state *si) +bool smb1_signing_is_desired(struct smb1_signing_state *si) { return si->desired; } diff --git a/libcli/smb/smb_signing.h b/libcli/smb/smb_signing.h index e6177c11485..7e50b04d4bb 100644 --- a/libcli/smb/smb_signing.h +++ b/libcli/smb/smb_signing.h @@ -46,7 +46,7 @@ bool smb1_signing_activate(struct smb1_signing_state *si, const DATA_BLOB user_session_key, const DATA_BLOB response); bool smb1_signing_is_active(struct smb1_signing_state *si); -bool smb_signing_is_desired(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 smb_signing_set_negotiated(struct smb1_signing_state *si, bool allowed, bool mandatory); diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index 14ce9a944fe..41a2a23de3c 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -343,7 +343,7 @@ static NTSTATUS reply_nt1(struct smb_request *req, uint16_t choice) secword |= NEGOTIATE_SECURITY_CHALLENGE_RESPONSE; } - signing_desired = smb_signing_is_desired(xconn->smb1.signing_state); + signing_desired = smb1_signing_is_desired(xconn->smb1.signing_state); signing_required = smb_signing_is_mandatory(xconn->smb1.signing_state); if (signing_desired) {