s3: libcli: Rename smb_signing_is_desired() -> smb1_signing_is_desired()

Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: David Mulder <dmulder@samba.org>

diff --git a/libcli/smb/smb_signing.c b/libcli/smb/smb_signing.c
index 7032776bd0e0fec1505281bdba8f32edd811af88..6b887b3627d37b7c418b72e3e74b3577692732db 100644 (file)
--- 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 e6177c114856e02ff16863dd6daff1d70ab081d3..7e50b04d4bb1d7926743dac81075cacd6920f45e 100644 (file)
--- 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 14ce9a944fe6cdd30da2d07086b231ada5c94275..41a2a23de3ce70495d76856f38ca14824950f750 100644 (file)
--- 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) {