From: Volker Lendecke <vl@samba.org>
Date: Mon, 11 Aug 2025 15:02:52 +0000 (+0200)
Subject: smbd: Make a few encryption-related functions static to smbstatus
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1670643c1f56b6085d7daa36727f5e2b81c9c87;p=thirdparty%2Fsamba.git

smbd: Make a few encryption-related functions static to smbstatus

Only referenced there, I got confused by them being part of smbd

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index aafce615d61..808ed6edfd6 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -582,11 +582,7 @@ NTSTATUS smbXsrv_tcon_global_traverse(
 			void *private_data);
 
 
-bool smbXsrv_is_encrypted(uint8_t encryption_flags);
-bool smbXsrv_is_partially_encrypted(uint8_t encryption_flags);
 bool smbXsrv_set_crypto_flag(uint8_t *flags, uint8_t flag);
-bool smbXsrv_is_signed(uint8_t signing_flags);
-bool smbXsrv_is_partially_signed(uint8_t signing_flags);
 
 struct smbd_smb2_send_queue {
 	struct smbd_smb2_send_queue *prev, *next;
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index dd5196e7fd0..764da7dd7b3 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -2829,21 +2829,6 @@ NTSTATUS smbd_smb2_request_verify_sizes(struct smbd_smb2_request *req,
 	return NT_STATUS_OK;
 }
 
-bool smbXsrv_is_encrypted(uint8_t encryption_flags)
-{
-	return (!(encryption_flags & SMBXSRV_PROCESSED_UNENCRYPTED_PACKET)
-		&&
-		(encryption_flags & (SMBXSRV_PROCESSED_ENCRYPTED_PACKET |
-				     SMBXSRV_ENCRYPTION_DESIRED |
-				     SMBXSRV_ENCRYPTION_REQUIRED)));
-}
-
-bool smbXsrv_is_partially_encrypted(uint8_t encryption_flags)
-{
-	return ((encryption_flags & SMBXSRV_PROCESSED_ENCRYPTED_PACKET) &&
-		(encryption_flags & SMBXSRV_PROCESSED_UNENCRYPTED_PACKET));
-}
-
 /* Set a flag if not already set, return true if set */
 bool smbXsrv_set_crypto_flag(uint8_t *flags, uint8_t flag)
 {
@@ -2912,23 +2897,6 @@ out:
 	return;
 }
 
-bool smbXsrv_is_signed(uint8_t signing_flags)
-{
-	/*
-	 * Signing is always enabled, so unless we got an unsigned
-	 * packet and at least one signed packet that was not
-	 * encrypted, the session or tcon is "signed".
-	 */
-	return (!(signing_flags & SMBXSRV_PROCESSED_UNSIGNED_PACKET) &&
-		(signing_flags & SMBXSRV_PROCESSED_SIGNED_PACKET));
-}
-
-bool smbXsrv_is_partially_signed(uint8_t signing_flags)
-{
-	return ((signing_flags & SMBXSRV_PROCESSED_UNSIGNED_PACKET) &&
-		(signing_flags & SMBXSRV_PROCESSED_SIGNED_PACKET));
-}
-
 static NTSTATUS smbd_smb2_request_dispatch_update_counts(
 				struct smbd_smb2_request *req,
 				bool modify_call)
diff --git a/source3/utils/status.c b/source3/utils/status.c
index f02b75b7f54..a9df2855768 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -528,6 +528,38 @@ static int prepare_connections(struct traverse_state *state)
 	return 0;
 }
 
+static bool smbXsrv_is_encrypted(uint8_t encryption_flags)
+{
+	return (!(encryption_flags & SMBXSRV_PROCESSED_UNENCRYPTED_PACKET)
+		&&
+		(encryption_flags & (SMBXSRV_PROCESSED_ENCRYPTED_PACKET |
+				     SMBXSRV_ENCRYPTION_DESIRED |
+				     SMBXSRV_ENCRYPTION_REQUIRED)));
+}
+
+static bool smbXsrv_is_partially_encrypted(uint8_t encryption_flags)
+{
+	return ((encryption_flags & SMBXSRV_PROCESSED_ENCRYPTED_PACKET) &&
+		(encryption_flags & SMBXSRV_PROCESSED_UNENCRYPTED_PACKET));
+}
+
+static bool smbXsrv_is_signed(uint8_t signing_flags)
+{
+	/*
+	 * Signing is always enabled, so unless we got an unsigned
+	 * packet and at least one signed packet that was not
+	 * encrypted, the session or tcon is "signed".
+	 */
+	return (!(signing_flags & SMBXSRV_PROCESSED_UNSIGNED_PACKET) &&
+		(signing_flags & SMBXSRV_PROCESSED_SIGNED_PACKET));
+}
+
+static bool smbXsrv_is_partially_signed(uint8_t signing_flags)
+{
+	return ((signing_flags & SMBXSRV_PROCESSED_UNSIGNED_PACKET) &&
+		(signing_flags & SMBXSRV_PROCESSED_SIGNED_PACKET));
+}
+
 static int traverse_connections(const struct connections_data *crec,
 				void *private_data)
 {