s3: libcli: Rename smb_signing_set_negotiated() -> smb1_signing_set_negotiated()

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

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 5ee73fbac4d85f4b6ef48d5ed10cbed65d07f336..2c40682345742e3e7db1b3c5f502a036d308ded9 100644 (file)
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -4659,7 +4659,7 @@ static void smbXcli_negprot_smb1_done(struct tevent_req *subreq)
                        server_mandatory = true;
                }
 
-               ok = smb_signing_set_negotiated(conn->smb1.signing,
+               ok = smb1_signing_set_negotiated(conn->smb1.signing,
                                                server_allowed,
                                                server_mandatory);
                if (!ok) {

diff --git a/libcli/smb/smb_signing.c b/libcli/smb/smb_signing.c
index 4ce51dea7e5961ada370706e6a43160dae583a65..8ba58b4b32f4e462626ae05fbc39afcdb6c3b636 100644 (file)
--- a/libcli/smb/smb_signing.c
+++ b/libcli/smb/smb_signing.c
@@ -449,7 +449,7 @@ bool smb1_signing_is_mandatory(struct smb1_signing_state *si)
        return si->mandatory;
 }
 
-bool smb_signing_set_negotiated(struct smb1_signing_state *si,
+bool smb1_signing_set_negotiated(struct smb1_signing_state *si,
                                bool allowed, bool mandatory)
 {
        if (si->active) {

diff --git a/libcli/smb/smb_signing.h b/libcli/smb/smb_signing.h
index 5d65a22a09563b1353ea789182f863b08aafe08d..7c1ed531e70fd8c8d15c27c80eba221afd3561d8 100644 (file)
--- a/libcli/smb/smb_signing.h
+++ b/libcli/smb/smb_signing.h
@@ -48,7 +48,7 @@ bool smb1_signing_activate(struct smb1_signing_state *si,
 bool smb1_signing_is_active(struct smb1_signing_state *si);
 bool smb1_signing_is_desired(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 smb1_signing_set_negotiated(struct smb1_signing_state *si,
                                bool allowed, bool mandatory);
 bool smb_signing_is_negotiated(struct smb1_signing_state *si);
 NTSTATUS smb_key_derivation(const uint8_t *KI,

diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index f64a408b0adb42a9028f66a6fb424302e7ff1894..ec00173be24036ce88a9625fd2226db6de9c8571 100644 (file)
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -261,7 +261,7 @@ bool srv_init_signing(struct smbXsrv_connection *conn)
 void srv_set_signing_negotiated(struct smbXsrv_connection *conn,
                                bool allowed, bool mandatory)
 {
-       smb_signing_set_negotiated(conn->smb1.signing_state,
+       smb1_signing_set_negotiated(conn->smb1.signing_state,
                                   allowed, mandatory);
 }