From: Jeremy Allison <jra@samba.org>
Date: Tue, 8 Mar 2022 03:31:34 +0000 (-0800)
Subject: s3: libcli: Rename smb_signing_is_active() -> smb1_signing_is_active()
X-Git-Tag: tevent-0.12.0~520
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c8bc1bf5689753cfbc1bc35d6cfba506446ac68;p=thirdparty%2Fsamba.git

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 1da4e4847f8..5ee73fbac4d 100644
--- 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 578eaf8c440..5f0ffba3b0c 100644
--- 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 cba6839c3ee..34bd6a0cff9 100644
--- 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 c9ac116bcbf..83d821d62ce 100644
--- 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 5d0e9086bd0..d2b2970ae3d 100644
--- 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);
 }