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

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

6 files changed, 38 insertions, 39 deletions

diff --git a/source3/libsmb/smb2cli_query_directory.c b/libcli/smb/smb2cli_query_directory.c
index cdd530c3f7..efc52d1ea7 100644
--- a/source3/libsmb/smb2cli_query_directory.c
+++ b/libcli/smb/smb2cli_query_directory.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_query_directory_state {
 	uint8_t fixed[32];
diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index 14d33ec678..9d0db39eb8 100644
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -469,4 +469,36 @@ NTSTATUS smb2cli_query_info(struct smbXcli_conn *conn,
 			    TALLOC_CTX *mem_ctx,
 			    DATA_BLOB *out_output_buffer);
 
+struct tevent_req *smb2cli_query_directory_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,
+						uint8_t level,
+						uint8_t flags,
+						uint32_t file_index,
+						uint64_t fid_persistent,
+						uint64_t fid_volatile,
+						const char *mask,
+						uint32_t outbuf_len);
+NTSTATUS smb2cli_query_directory_recv(struct tevent_req *req,
+				      TALLOC_CTX *mem_ctx,
+				      uint8_t **data,
+				      uint32_t *data_length);
+NTSTATUS smb2cli_query_directory(struct smbXcli_conn *conn,
+				 uint32_t timeout_msec,
+				 struct smbXcli_session *session,
+				 uint32_t tcon_id,
+				 uint8_t level,
+				 uint8_t flags,
+				 uint32_t file_index,
+				 uint64_t fid_persistent,
+				 uint64_t fid_volatile,
+				 const char *mask,
+				 uint32_t outbuf_len,
+				 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 f7df3eee41..391c0541d2 100755
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -16,6 +16,7 @@ bld.SAMBA_LIBRARY('cli_smb_common',
 		smb2cli_flush.c
 		smb2cli_set_info.c
 		smb2cli_query_info.c
+		smb2cli_query_directory.c
 	''',
 	deps='LIBCRYPTO errors gensec krb5samba LIBASYNC_REQ',
 	public_deps='talloc samba-util',
diff --git a/source3/Makefile.in b/source3/Makefile.in
index b7a0002f69..d8ed1b18f1 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -626,7 +626,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
 	     ../libcli/smb/smb2cli_flush.o \
 	     ../libcli/smb/smb2cli_read.o \
 	     ../libcli/smb/smb2cli_write.o \
-	     libsmb/smb2cli_query_directory.o \
+	     ../libcli/smb/smb2cli_query_directory.o \
 	     libsmb/smb2cli_ioctl.o \
 	     ../libcli/smb/smb2cli_query_info.o \
 	     ../libcli/smb/smb2cli_set_info.o \
diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index ee0e6b511d..6425b8fdc0 100644
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -37,38 +37,7 @@ struct tevent_req *smb2cli_tdis_send(TALLOC_CTX *mem_ctx,
 NTSTATUS smb2cli_tdis_recv(struct tevent_req *req);
 NTSTATUS smb2cli_tdis(struct cli_state *cli);
 
-struct tevent_req *smb2cli_query_directory_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,
-						uint8_t level,
-						uint8_t flags,
-						uint32_t file_index,
-						uint64_t fid_persistent,
-						uint64_t fid_volatile,
-						const char *mask,
-						uint32_t outbuf_len);
-NTSTATUS smb2cli_query_directory_recv(struct tevent_req *req,
-				      TALLOC_CTX *mem_ctx,
-				      uint8_t **data,
-				      uint32_t *data_length);
-NTSTATUS smb2cli_query_directory(struct smbXcli_conn *conn,
-				 uint32_t timeout_msec,
-				 struct smbXcli_session *session,
-				 uint32_t tcon_id,
-				 uint8_t level,
-				 uint8_t flags,
-				 uint32_t file_index,
-				 uint64_t fid_persistent,
-				 uint64_t fid_volatile,
-				 const char *mask,
-				 uint32_t outbuf_len,
-				 TALLOC_CTX *mem_ctx,
-				 uint8_t **data,
-				 uint32_t *data_length);
-
+l
 struct tevent_req *smb2cli_ioctl_send(TALLOC_CTX *mem_ctx,
 				      struct tevent_context *ev,
 				      struct smbXcli_conn *conn,
diff --git a/source3/wscript_build b/source3/wscript_build
index 141ea4b7a8..5d9779243b 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -131,7 +131,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/async_smb.c
              libsmb/clisigning.c
              libsmb/smb2cli_tcon.c
-             libsmb/smb2cli_query_directory.c
              libsmb/smb2cli_ioctl.c
              libsmb/cli_np_tstream.c
              libsmb/reparse_symlink.c