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

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

diff --git a/source3/libsmb/smb2cli_query_info.c b/libcli/smb/smb2cli_query_info.c
similarity index 97%
rename from source3/libsmb/smb2cli_query_info.c
rename to libcli/smb/smb2cli_query_info.c
index 366dc4a9604834a0ce9956692fbafb1f488e0571..30766e4d4ed8e1e9db630e0db58ef71139fe8839 100644 (file)
--- a/source3/libsmb/smb2cli_query_info.c
+++ b/libcli/smb/smb2cli_query_info.c
@@ -18,13 +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 "../librpc/ndr/libndr.h"
+#include "smb_common.h"
+#include "smbXcli_base.h"
 
 struct smb2cli_query_info_state {
        uint8_t fixed[0x28];

diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index 8a6dc23c6c4140256406b188e953b17b5e471688..14d33ec678247c838ab563ab560f2167ac0c4023 100644 (file)
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -437,4 +437,36 @@ NTSTATUS smb2cli_set_info(struct smbXcli_conn *conn,
                            uint64_t in_fid_persistent,
                            uint64_t in_fid_volatile);
 
+struct tevent_req *smb2cli_query_info_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 in_info_type,
+                                          uint8_t in_file_info_class,
+                                          uint32_t in_max_output_length,
+                                          const DATA_BLOB *in_input_buffer,
+                                          uint32_t in_additional_info,
+                                          uint32_t in_flags,
+                                          uint64_t in_fid_persistent,
+                                          uint64_t in_fid_volatile);
+NTSTATUS smb2cli_query_info_recv(struct tevent_req *req,
+                                TALLOC_CTX *mem_ctx,
+                                DATA_BLOB *out_output_buffer);
+NTSTATUS smb2cli_query_info(struct smbXcli_conn *conn,
+                           uint32_t timeout_msec,
+                           struct smbXcli_session *session,
+                           uint32_t tcon_id,
+                           uint8_t in_info_type,
+                           uint8_t in_file_info_class,
+                           uint32_t in_max_output_length,
+                           const DATA_BLOB *in_input_buffer,
+                           uint32_t in_additional_info,
+                           uint32_t in_flags,
+                           uint64_t in_fid_persistent,
+                           uint64_t in_fid_volatile,
+                           TALLOC_CTX *mem_ctx,
+                           DATA_BLOB *out_output_buffer);
+
 #endif /* _SMBXCLI_BASE_H_ */

diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build
index b3b8bcc2d3436bb11fcca29cdf04dc4b6fab91aa..f7df3eee41824bb1832a8261940fa8fa2c09d78b 100755 (executable)
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -15,6 +15,7 @@ bld.SAMBA_LIBRARY('cli_smb_common',
                smb2cli_write.c
                smb2cli_flush.c
                smb2cli_set_info.c
+               smb2cli_query_info.c
        ''',
        deps='LIBCRYPTO errors gensec krb5samba LIBASYNC_REQ',
        public_deps='talloc samba-util',

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4a3ddc1a32286d61869eb9e249f38782aebb0277..b7a0002f6966a38a6bf8bd0854cbec5dab819761 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -628,7 +628,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
             ../libcli/smb/smb2cli_write.o \
             libsmb/smb2cli_query_directory.o \
             libsmb/smb2cli_ioctl.o \
-            libsmb/smb2cli_query_info.o \
+            ../libcli/smb/smb2cli_query_info.o \
             ../libcli/smb/smb2cli_set_info.o \
             libsmb/cli_np_tstream.o \
             libsmb/smbsock_connect.o \

diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index 39ce80a613d7784764506ec9666c1a639bb8a843..ee0e6b511da6207ed1e570414c05639cbad68eae 100644 (file)
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -103,36 +103,4 @@ NTSTATUS smb2cli_ioctl(struct smbXcli_conn *conn,
                       DATA_BLOB *out_input_buffer,
                       DATA_BLOB *out_output_buffer);
 
-struct tevent_req *smb2cli_query_info_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 in_info_type,
-                                          uint8_t in_file_info_class,
-                                          uint32_t in_max_output_length,
-                                          const DATA_BLOB *in_input_buffer,
-                                          uint32_t in_additional_info,
-                                          uint32_t in_flags,
-                                          uint64_t in_fid_persistent,
-                                          uint64_t in_fid_volatile);
-NTSTATUS smb2cli_query_info_recv(struct tevent_req *req,
-                                TALLOC_CTX *mem_ctx,
-                                DATA_BLOB *out_output_buffer);
-NTSTATUS smb2cli_query_info(struct smbXcli_conn *conn,
-                           uint32_t timeout_msec,
-                           struct smbXcli_session *session,
-                           uint32_t tcon_id,
-                           uint8_t in_info_type,
-                           uint8_t in_file_info_class,
-                           uint32_t in_max_output_length,
-                           const DATA_BLOB *in_input_buffer,
-                           uint32_t in_additional_info,
-                           uint32_t in_flags,
-                           uint64_t in_fid_persistent,
-                           uint64_t in_fid_volatile,
-                           TALLOC_CTX *mem_ctx,
-                           DATA_BLOB *out_output_buffer);
-
 #endif /* __SMB2CLI_H__ */

diff --git a/source3/wscript_build b/source3/wscript_build
index 19dbead340ab81d0537325b62d40eec8a6e56b39..141ea4b7a84d34817cb8592922fddfbb1e0df4a3 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -133,7 +133,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/smb2cli_tcon.c
              libsmb/smb2cli_query_directory.c
              libsmb/smb2cli_ioctl.c
-             libsmb/smb2cli_query_info.c
              libsmb/cli_np_tstream.c
              libsmb/reparse_symlink.c
              libsmb/clisymlink.c