s3: libcli: Rename smb_signing_is_active() -> smb1_signing_is_active()

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 1da4e4847f8f26c74f09e2df41862aecc8bf279b..5ee73fbac4d85f4b6ef48d5ed10cbed65d07f336 100644 (file)
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -806,7 +806,7 @@ bool smb1cli_conn_check_signing(struct smbXcli_conn *conn,
 
 bool smb1cli_conn_signing_is_active(struct smbXcli_conn *conn)
 {
-       return smb_signing_is_active(conn->smb1.signing);
+       return smb1_signing_is_active(conn->smb1.signing);
 }
 
 void smb1cli_conn_set_encryption(struct smbXcli_conn *conn,

diff --git a/libcli/smb/smb_signing.c b/libcli/smb/smb_signing.c
index 578eaf8c4403d5f29522aeb28dfdd11ec49c274d..5f0ffba3b0ca05dec946fd0321d01a24ab8c76f3 100644 (file)
--- a/libcli/smb/smb_signing.c
+++ b/libcli/smb/smb_signing.c
@@ -434,7 +434,7 @@ bool smb1_signing_activate(struct smb1_signing_state *si,
        return true;
 }
 
-bool smb_signing_is_active(struct smb1_signing_state *si)
+bool smb1_signing_is_active(struct smb1_signing_state *si)
 {
        return si->active;
 }

diff --git a/libcli/smb/smb_signing.h b/libcli/smb/smb_signing.h
index cba6839c3ee1616a805da271b0bfb41a09c2a11d..34bd6a0cff9e33a4c95a1a8b3a735b106d057f96 100644 (file)
--- a/libcli/smb/smb_signing.h
+++ b/libcli/smb/smb_signing.h
@@ -45,7 +45,7 @@ bool smb1_signing_check_pdu(struct smb1_signing_state *si,
 bool smb1_signing_activate(struct smb1_signing_state *si,
                          const DATA_BLOB user_session_key,
                          const DATA_BLOB response);
-bool smb_signing_is_active(struct smb1_signing_state *si);
+bool smb1_signing_is_active(struct smb1_signing_state *si);
 bool smb_signing_is_allowed(struct smb1_signing_state *si);
 bool smb_signing_is_desired(struct smb1_signing_state *si);
 bool smb_signing_is_mandatory(struct smb1_signing_state *si);

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index c9ac116bcbf7e74de1184485934c8bd1dca4d03c..83d821d62ce21817c94fdcc62e68ab7fab50176a 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3452,7 +3452,7 @@ static bool lp_use_sendfile(int snum, struct smb1_signing_state *signing_state)
                return false;
        }
        if (signing_state) {
-               sign_active = smb_signing_is_active(signing_state);
+               sign_active = smb1_signing_is_active(signing_state);
        }
        return (lp__use_sendfile(snum) &&
                        (get_remote_arch() != RA_WIN95) &&

diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index 5d0e9086bd0f779a8c7791d8120969f290135206..d2b2970ae3dba9b37cdc635af076a0703f2c9802 100644 (file)
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -272,7 +272,7 @@ void srv_set_signing_negotiated(struct smbXsrv_connection *conn,
 
 bool srv_is_signing_active(struct smbXsrv_connection *conn)
 {
-       return smb_signing_is_active(conn->smb1.signing_state);
+       return smb1_signing_is_active(conn->smb1.signing_state);
 }