libcli/smb: move smb2cli_read.c from source3 to the toplevel

Signed-off-by: Stefan Metzmacher <metze@samba.org>

6 files changed, 33 insertions, 35 deletions

diff --git a/source3/libsmb/smb2cli_read.c b/libcli/smb/smb2cli_read.c
index c5e40b7c57..29b9f378e6 100644
--- a/source3/libsmb/smb2cli_read.c
+++ b/libcli/smb/smb2cli_read.c
@@ -18,12 +18,10 @@
 */
 
 #include "includes.h"
-#include "client.h"
-#include "async_smb.h"
-#include "../libcli/smb/smbXcli_base.h"
-#include "smb2cli.h"
-#include "libsmb/proto.h"
+#include "system/network.h"
 #include "lib/util/tevent_ntstatus.h"
+#include "smb_common.h"
+#include "smbXcli_base.h"
 
 struct smb2cli_read_state {
 	uint8_t fixed[48];
diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index baac22c555..3d1f393877 100644
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -343,4 +343,32 @@ NTSTATUS smb2cli_close(struct smbXcli_conn *conn,
 		       uint64_t fid_persistent,
 		       uint64_t fid_volatile);
 
+struct tevent_req *smb2cli_read_send(TALLOC_CTX *mem_ctx,
+				     struct tevent_context *ev,
+				     struct smbXcli_conn *conn,
+				     uint32_t timeout_msec,
+				     struct smbXcli_session *session,
+				     uint32_t tcon_id,
+				     uint32_t length,
+				     uint64_t offset,
+				     uint64_t fid_persistent,
+				     uint64_t fid_volatile,
+				     uint64_t minimum_count,
+				     uint64_t remaining_bytes);
+NTSTATUS smb2cli_read_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+			   uint8_t **data, uint32_t *data_length);
+NTSTATUS smb2cli_read(struct smbXcli_conn *conn,
+		      uint32_t timeout_msec,
+		      struct smbXcli_session *session,
+		      uint32_t tcon_id,
+		      uint32_t length,
+		      uint64_t offset,
+		      uint64_t fid_persistent,
+		      uint64_t fid_volatile,
+		      uint64_t minimum_count,
+		      uint64_t remaining_bytes,
+		      TALLOC_CTX *mem_ctx,
+		      uint8_t **data,
+		      uint32_t *data_length);
+
 #endif /* _SMBXCLI_BASE_H_ */
diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build
index 904e895878..69f9f032ae 100755
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -11,6 +11,7 @@ bld.SAMBA_LIBRARY('cli_smb_common',
 		smb2cli_session.c
                 smb2cli_create.c
                 smb2cli_close.c
+		smb2cli_read.c
 	''',
 	deps='LIBCRYPTO errors gensec krb5samba LIBASYNC_REQ',
 	public_deps='talloc samba-util',
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 0d28cfe32c..f64bc5b322 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -624,7 +624,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
 	     ../libcli/smb/smb2_signing.o \
 	     ../libcli/smb/smb2cli_close.o \
 	     libsmb/smb2cli_flush.o \
-	     libsmb/smb2cli_read.o \
+	     ../libcli/smb/smb2cli_read.o \
 	     libsmb/smb2cli_write.o \
 	     libsmb/smb2cli_query_directory.o \
 	     libsmb/smb2cli_ioctl.o \
diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index 98247432eb..0d7ee1faaf 100644
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -53,34 +53,6 @@ NTSTATUS smb2cli_flush(struct smbXcli_conn *conn,
 		       uint64_t fid_persistent,
 		       uint64_t fid_volatile);
 
-struct tevent_req *smb2cli_read_send(TALLOC_CTX *mem_ctx,
-				     struct tevent_context *ev,
-				     struct smbXcli_conn *conn,
-				     uint32_t timeout_msec,
-				     struct smbXcli_session *session,
-				     uint32_t tcon_id,
-				     uint32_t length,
-				     uint64_t offset,
-				     uint64_t fid_persistent,
-				     uint64_t fid_volatile,
-				     uint64_t minimum_count,
-				     uint64_t remaining_bytes);
-NTSTATUS smb2cli_read_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
-			   uint8_t **data, uint32_t *data_length);
-NTSTATUS smb2cli_read(struct smbXcli_conn *conn,
-		      uint32_t timeout_msec,
-		      struct smbXcli_session *session,
-		      uint32_t tcon_id,
-		      uint32_t length,
-		      uint64_t offset,
-		      uint64_t fid_persistent,
-		      uint64_t fid_volatile,
-		      uint64_t minimum_count,
-		      uint64_t remaining_bytes,
-		      TALLOC_CTX *mem_ctx,
-		      uint8_t **data,
-		      uint32_t *data_length);
-
 struct tevent_req *smb2cli_write_send(TALLOC_CTX *mem_ctx,
 				      struct tevent_context *ev,
 				      struct smbXcli_conn *conn,
diff --git a/source3/wscript_build b/source3/wscript_build
index 221c354748..9a68527013 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -132,7 +132,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/clisigning.c
              libsmb/smb2cli_tcon.c
              libsmb/smb2cli_flush.c
-             libsmb/smb2cli_read.c
              libsmb/smb2cli_write.c
              libsmb/smb2cli_query_directory.c
              libsmb/smb2cli_ioctl.c