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

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

diff --git a/source3/libsmb/smb2cli_query_directory.c b/libcli/smb/smb2cli_query_directory.c
similarity index 97%
rename from source3/libsmb/smb2cli_query_directory.c
rename to libcli/smb/smb2cli_query_directory.c
index cdd530c3f790ddac685e50ee2f8db3ee0ecfaf71..efc52d1ea711aad176f9aabb8aae848152c88c20 100644 (file)
--- 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 14d33ec678247c838ab563ab560f2167ac0c4023..9d0db39eb89fba7fd28666b8f36056a9aa84289e 100644 (file)
--- 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 f7df3eee41824bb1832a8261940fa8fa2c09d78b..391c0541d2c2de9933d8ad40e76d5de451780781 100755 (executable)
--- 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 b7a0002f6966a38a6bf8bd0854cbec5dab819761..d8ed1b18f137e95fc44de7fd13cca2b91e447411 100644 (file)
--- 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 ee0e6b511da6207ed1e570414c05639cbad68eae..6425b8fdc06b1c61c56a84d6ed687e3f5036dbaa 100644 (file)
--- 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 141ea4b7a84d34817cb8592922fddfbb1e0df4a3..5d9779243b4d0bd01cb91cd2ff52560b9e668d2c 100755 (executable)
--- 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