s3: libcli: Rename smb_signing_is_negotiated() -> smb1_signing_is_negotiated()

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 8ba58b4b32f4e462626ae05fbc39afcdb6c3b636..0a3e1f7121e7aeb47c64a25b6fed5bb44a8496f6 100644 (file)
--- a/libcli/smb/smb_signing.c
+++ b/libcli/smb/smb_signing.c
@@ -492,7 +492,7 @@ bool smb1_signing_set_negotiated(struct smb1_signing_state *si,
        return true;
 }
 
-bool smb_signing_is_negotiated(struct smb1_signing_state *si)
+bool smb1_signing_is_negotiated(struct smb1_signing_state *si)
 {
        return si->negotiated;
 }

diff --git a/libcli/smb/smb_signing.h b/libcli/smb/smb_signing.h
index 7c1ed531e70fd8c8d15c27c80eba221afd3561d8..7cefb688a07dbb80c3d1c00a40a45e6575e55620 100644 (file)
--- a/libcli/smb/smb_signing.h
+++ b/libcli/smb/smb_signing.h
@@ -50,7 +50,7 @@ bool smb1_signing_is_desired(struct smb1_signing_state *si);
 bool smb1_signing_is_mandatory(struct smb1_signing_state *si);
 bool smb1_signing_set_negotiated(struct smb1_signing_state *si,
                                bool allowed, bool mandatory);
-bool smb_signing_is_negotiated(struct smb1_signing_state *si);
+bool smb1_signing_is_negotiated(struct smb1_signing_state *si);
 NTSTATUS smb_key_derivation(const uint8_t *KI,
                            size_t KI_len,
                            uint8_t KO[16]);

diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index ec00173be24036ce88a9625fd2226db6de9c8571..c05c3a37b96d89d3f2606e917f1771378886b1aa 100644 (file)
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -283,7 +283,7 @@ bool srv_is_signing_active(struct smbXsrv_connection *conn)
 
 bool srv_is_signing_negotiated(struct smbXsrv_connection *conn)
 {
-       return smb_signing_is_negotiated(conn->smb1.signing_state);
+       return smb1_signing_is_negotiated(conn->smb1.signing_state);
 }
 
 /***********************************************************
@@ -300,7 +300,7 @@ void srv_set_signing(struct smbXsrv_connection *conn,
        if (!user_session_key.length)
                return;
 
-       negotiated = smb_signing_is_negotiated(conn->smb1.signing_state);
+       negotiated = smb1_signing_is_negotiated(conn->smb1.signing_state);
        mandatory = smb1_signing_is_mandatory(conn->smb1.signing_state);
 
        if (!negotiated && !mandatory) {