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 aafce615d61d373ed74e56036786c5aa18153b4a..808ed6edfd62f63ff2108ab768ad4d149fdf27c3 100644 (file)
--- 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 dd5196e7fd0188ea596a5f4cc956152f458ce667..764da7dd7b3cb82225ae851a286a92519a35c2af 100644 (file)
--- 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 f02b75b7f5495d421ca26839b1d3e67498515904..a9df28557682a8f107d753f665a276e30be7023e 100644 (file)
--- 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)
 {