From: David Mulder <dmulder@suse.com>
Date: Thu, 17 Mar 2022 20:28:10 +0000 (-0600)
Subject: smbd: Move srv_init_signing to smb2_signing.c
X-Git-Tag: tevent-0.12.0~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7893b3cb92ee78d1af976dfbcc425222fb5fe0e6;p=thirdparty%2Fsamba.git

smbd: Move srv_init_signing to smb2_signing.c

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

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 81f2e6c969d..344371f26f6 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -57,7 +57,6 @@ bool smb1_srv_check_sign_mac(struct smbXsrv_connection *conn,
 NTSTATUS smb1_srv_calculate_sign_mac(struct smbXsrv_connection *conn,
 				char *outbuf, uint32_t seqnum);
 void smb1_srv_cancel_sign_response(struct smbXsrv_connection *conn);
-bool srv_init_signing(struct smbXsrv_connection *conn);
 void smb1_srv_set_signing_negotiated(struct smbXsrv_connection *conn,
 			        bool allowed, bool mandatory);
 bool smb1_srv_is_signing_active(struct smbXsrv_connection *conn);
@@ -65,10 +64,12 @@ bool smb1_srv_is_signing_negotiated(struct smbXsrv_connection *conn);
 void smb1_srv_set_signing(struct smbXsrv_connection *conn,
 		     const DATA_BLOB user_session_key,
 		     const DATA_BLOB response);
+bool smb1_srv_init_signing(struct smbXsrv_connection *conn);
 
 /* The following definitions come from smbd/smb2_signing.c */
 
 bool smb2_srv_init_signing(struct smbXsrv_connection *conn);
+bool srv_init_signing(struct smbXsrv_connection *conn);
 
 /* The following definitions come from smbd/aio.c  */
 
diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index 2a578fe530f..6bcb0629c4f 100644
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -170,7 +170,7 @@ static void smbd_shm_signing_free(TALLOC_CTX *mem_ctx, void *ptr)
  Called by server negprot when signing has been negotiated.
 ************************************************************/
 
-static bool smb1_srv_init_signing(struct smbXsrv_connection *conn)
+bool smb1_srv_init_signing(struct smbXsrv_connection *conn)
 {
 	bool allowed = true;
 	bool desired;
@@ -232,15 +232,6 @@ static bool smb1_srv_init_signing(struct smbXsrv_connection *conn)
 	return true;
 }
 
-bool srv_init_signing(struct smbXsrv_connection *conn)
-{
-	if (conn->protocol >= PROTOCOL_SMB2_02) {
-		return smb2_srv_init_signing(conn);
-	} else {
-		return smb1_srv_init_signing(conn);
-	}
-}
-
 void smb1_srv_set_signing_negotiated(struct smbXsrv_connection *conn,
 				bool allowed, bool mandatory)
 {
diff --git a/source3/smbd/smb2_signing.c b/source3/smbd/smb2_signing.c
index b80f995116e..d55b84e46e3 100644
--- a/source3/smbd/smb2_signing.c
+++ b/source3/smbd/smb2_signing.c
@@ -42,3 +42,12 @@ bool smb2_srv_init_signing(struct smbXsrv_connection *conn)
 	talloc_unlink(conn, lp_ctx);
 	return true;
 }
+
+bool srv_init_signing(struct smbXsrv_connection *conn)
+{
+	if (conn->protocol >= PROTOCOL_SMB2_02) {
+		return smb2_srv_init_signing(conn);
+	} else {
+		return smb1_srv_init_signing(conn);
+	}
+}