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

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 8ba58b4b32f..0a3e1f7121e 100644
--- 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 7c1ed531e70..7cefb688a07 100644
--- 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 ec00173be24..c05c3a37b96 100644
--- 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) {