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 81f2e6c969d4532241cdc09c56dee54d97bf10e2..344371f26f603c38f7af0aa9655061e319edf3a8 100644 (file)
--- 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 2a578fe530f320a22739b88b3d89b04c9a671e86..6bcb0629c4f067bcb8ea3ae5aa199a08357e954d 100644 (file)
--- 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 b80f995116e9f373115e995434105e8b86a00fee..d55b84e46e3d90a1afa4c1db4a2324efab9f21a0 100644 (file)
--- 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);
+       }
+}