smbd: Move ipc.c -> smb1_ipc.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 a2b1c6d933d97c6ed7a0865b3d233959cffd1d34..e58a6630ed52e3af79f95a1e52a03b29989a108d 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -476,16 +476,6 @@ NTSTATUS parent_pathref(TALLOC_CTX *mem_ctx,
                        struct smb_filename **_parent,
                        struct smb_filename **_atname);
 
-/* The following definitions come from smbd/ipc.c  */
-
-void send_trans_reply(connection_struct *conn,
-                     struct smb_request *req,
-                     char *rparam, int rparam_len,
-                     char *rdata, int rdata_len,
-                     bool buffer_too_large);
-void reply_trans(struct smb_request *req);
-void reply_transs(struct smb_request *req);
-
 /* The following definitions come from smbd/smb2_ipc.c  */
 
 NTSTATUS nt_status_np_pipe(NTSTATUS status);

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

diff --git a/source3/smbd/smb1_ipc.h b/source3/smbd/smb1_ipc.h
new file mode 100644 (file)
index 0000000..5866f21
--- /dev/null
+++ b/source3/smbd/smb1_ipc.h
@@ -0,0 +1,33 @@
+/*
+   Unix SMB/CIFS implementation.
+   Inter-process communication and named pipe handling
+   Copyright (C) Andrew Tridgell 1992-1998
+
+   SMB Version handling
+   Copyright (C) John H Terpstra 1995-1998
+
+   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/>.
+   */
+/*
+   This file handles the named pipe and mailslot calls
+   in the SMBtrans protocol
+   */
+
+void send_trans_reply(connection_struct *conn,
+                     struct smb_request *req,
+                     char *rparam, int rparam_len,
+                     char *rdata, int rdata_len,
+                     bool buffer_too_large);
+void reply_trans(struct smb_request *req);
+void reply_transs(struct smb_request *req);

diff --git a/source3/smbd/smbd.h b/source3/smbd/smbd.h
index dcd0d2f96fc9bfae960f6d0a62e93261137ff89c..1e55a4df73a199fc497bbfe4a0ca19f28fc1175d 100644 (file)
--- a/source3/smbd/smbd.h
+++ b/source3/smbd/smbd.h
@@ -31,6 +31,7 @@ struct dptr_struct;
 #include "smbd/smb1_sesssetup.h"
 #include "smbd/smb1_lanman.h"
 #include "smbd/smb1_aio.h"
+#include "smbd/smb1_ipc.h"
 #endif
 
 struct trans_state {

diff --git a/source3/wscript_build b/source3/wscript_build
index f1ad272cdabf3edece19add2d055d52c905ea1bf..4cf84176e5fbc6e13a6094fe0615321a2ce75a77 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -604,6 +604,7 @@ if bld.CONFIG_SET('WITH_SMB1SERVER'):
                    smbd/smb1_lanman.c
                    smbd/smb1_utils.c
                    smbd/smb1_aio.c
+                   smbd/smb1_ipc.c
     '''
 else:
     SMB1_SOURCES = ''
@@ -622,7 +623,6 @@ bld.SAMBA3_LIBRARY('smbd_base',
                           smbd/conn_idle.c
                           smbd/share_access.c
                           smbd/fileio.c
-                          smbd/ipc.c
                           smbd/smb2_ipc.c
                           smbd/negprot.c
                           smbd/nttrans.c