From: David Mulder <dmulder@suse.com>
Date: Fri, 11 Mar 2022 16:53:04 +0000 (-0700)
Subject: smbd: Move nt_status_np_pipe to smb2_ipc.c
X-Git-Tag: tevent-0.12.0~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49f7763dc04c5299d2a7bfce439ec1ac047aa749;p=thirdparty%2Fsamba.git

smbd: Move nt_status_np_pipe to smb2_ipc.c

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 46904b980a2..47b2085c28b 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -80,17 +80,6 @@ static void copy_trans_params_and_data(char *outbuf, int align,
 		memcpy(copy_into, &rdata[data_offset], data_len);
 }
 
-NTSTATUS nt_status_np_pipe(NTSTATUS status)
-{
-	if (NT_STATUS_EQUAL(status, NT_STATUS_CONNECTION_DISCONNECTED)) {
-		status = NT_STATUS_PIPE_DISCONNECTED;
-	} else if (NT_STATUS_EQUAL(status, NT_STATUS_CONNECTION_RESET)) {
-		status = NT_STATUS_PIPE_BROKEN;
-	}
-
-	return status;
-}
-
 /****************************************************************************
  Send a trans reply.
  ****************************************************************************/
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index e557092279c..a2b1c6d933d 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -478,7 +478,6 @@ NTSTATUS parent_pathref(TALLOC_CTX *mem_ctx,
 
 /* The following definitions come from smbd/ipc.c  */
 
-NTSTATUS nt_status_np_pipe(NTSTATUS status);
 void send_trans_reply(connection_struct *conn,
 		      struct smb_request *req,
 		      char *rparam, int rparam_len,
@@ -487,6 +486,10 @@ void send_trans_reply(connection_struct *conn,
 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);
+
 /* The following definitions come from smbd/mangle.c  */
 
 void mangle_reset_cache(void);
diff --git a/source3/smbd/smb2_ipc.c b/source3/smbd/smb2_ipc.c
new file mode 100644
index 00000000000..fbe22334a8a
--- /dev/null
+++ b/source3/smbd/smb2_ipc.c
@@ -0,0 +1,40 @@
+/*
+   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
+   */
+
+#include "includes.h"
+#include "smbd/smbd.h"
+#include "smbd/globals.h"
+
+NTSTATUS nt_status_np_pipe(NTSTATUS status)
+{
+	if (NT_STATUS_EQUAL(status, NT_STATUS_CONNECTION_DISCONNECTED)) {
+		status = NT_STATUS_PIPE_DISCONNECTED;
+	} else if (NT_STATUS_EQUAL(status, NT_STATUS_CONNECTION_RESET)) {
+		status = NT_STATUS_PIPE_BROKEN;
+	}
+
+	return status;
+}
diff --git a/source3/wscript_build b/source3/wscript_build
index 415263089ca..f1ad272cdab 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -623,6 +623,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                           smbd/share_access.c
                           smbd/fileio.c
                           smbd/ipc.c
+                          smbd/smb2_ipc.c
                           smbd/negprot.c
                           smbd/nttrans.c
                           smbd/pipes.c