smbd: Move signing.c -> smb1_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 344371f26f603c38f7af0aa9655061e319edf3a8..9405f7baa5558b623ef47b1e8882863fc7549c0f 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -46,26 +46,10 @@
 #ifndef _SMBD_PROTO_H_
 #define _SMBD_PROTO_H_
 
-/* The following definitions come from smbd/signing.c  */
-
 struct smbXsrv_client;
 struct smbXsrv_connection;
 struct dcesrv_context;
 
-bool smb1_srv_check_sign_mac(struct smbXsrv_connection *conn,
-                       const char *inbuf, uint32_t *seqnum, bool trusted_channel);
-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);
-void smb1_srv_set_signing_negotiated(struct smbXsrv_connection *conn,
-                               bool allowed, bool mandatory);
-bool smb1_srv_is_signing_active(struct smbXsrv_connection *conn);
-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);

diff --git a/source3/smbd/signing.c b/source3/smbd/smb1_signing.c
similarity index 100%
rename from source3/smbd/signing.c
rename to source3/smbd/smb1_signing.c

diff --git a/source3/smbd/smb1_signing.h b/source3/smbd/smb1_signing.h
new file mode 100644 (file)
index 0000000..56c59c5
--- /dev/null
+++ b/source3/smbd/smb1_signing.h
@@ -0,0 +1,36 @@
+/*
+   Unix SMB/CIFS implementation.
+   SMB Signing Code
+   Copyright (C) Jeremy Allison 2003.
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2002-2003
+   Copyright (C) Stefan Metzmacher 2009
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+struct smbXsrv_connection;
+
+bool smb1_srv_check_sign_mac(struct smbXsrv_connection *conn,
+                       const char *inbuf, uint32_t *seqnum, bool trusted_channel);
+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);
+void smb1_srv_set_signing_negotiated(struct smbXsrv_connection *conn,
+                               bool allowed, bool mandatory);
+bool smb1_srv_is_signing_active(struct smbXsrv_connection *conn);
+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);

diff --git a/source3/smbd/smbd.h b/source3/smbd/smbd.h
index a2e24af310889ed0d8679bc04d6f1f9598f3d513..133032ccea55fec82d49671c3f8c4b78b3a370eb 100644 (file)
--- a/source3/smbd/smbd.h
+++ b/source3/smbd/smbd.h
@@ -38,6 +38,7 @@ struct dptr_struct;
 #include "smbd/smb1_pipes.h"
 #include "smbd/smb1_reply.h"
 #include "smbd/smb1_service.h"
+#include "smbd/smb1_signing.h"
 #endif
 
 struct trans_state {

diff --git a/source3/wscript_build b/source3/wscript_build
index 92d9937fda94198f18449bd6f01377aba0ccd21f..fd1f852b995f8d103a5b37283cc0ef66c8e0abe0 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -611,6 +611,7 @@ if bld.CONFIG_SET('WITH_SMB1SERVER'):
                    smbd/smb1_pipes.c
                    smbd/smb1_reply.c
                    smbd/smb1_service.c
+                   smbd/smb1_signing.c
     '''
 else:
     SMB1_SOURCES = ''
@@ -663,7 +664,6 @@ bld.SAMBA3_LIBRARY('smbd_base',
                           smbd/msdfs.c
                           smbd/smb2_aio.c smbd/statvfs.c
                           smbd/dmapi.c
-                          smbd/signing.c
                           smbd/smb2_signing.c
                           smbd/file_access.c
                           smbd/dnsregister.c smbd/globals.c