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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue May 15 20:17:01 CEST 2012 on sn-devel-104

diff --git a/source3/libsmb/smb2cli_ioctl.c b/libcli/smb/smb2cli_ioctl.c
similarity index 98%
rename from source3/libsmb/smb2cli_ioctl.c
rename to libcli/smb/smb2cli_ioctl.c
index c80ae49a58a646d5793a48e9a3681936f093b5b3..2881c742ce5bd63efba2999c48ac71018f62315a 100644 (file)
--- a/source3/libsmb/smb2cli_ioctl.c
+++ b/libcli/smb/smb2cli_ioctl.c
@@ -18,13 +18,11 @@
 */
 
 #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"
+#include "librpc/ndr/libndr.h"
 
 struct smb2cli_ioctl_state {
        uint8_t fixed[0x38];

diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index 9d0db39eb89fba7fd28666b8f36056a9aa84289e..81a8e93ade65bcf397fddb2808c1aa48531d2118 100644 (file)
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -501,4 +501,38 @@ NTSTATUS smb2cli_query_directory(struct smbXcli_conn *conn,
                                 uint8_t **data,
                                 uint32_t *data_length);
 
+struct tevent_req *smb2cli_ioctl_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,
+                                     uint64_t in_fid_persistent,
+                                     uint64_t in_fid_volatile,
+                                     uint32_t in_ctl_code,
+                                     uint32_t in_max_input_length,
+                                     const DATA_BLOB *in_input_buffer,
+                                     uint32_t in_max_output_length,
+                                     const DATA_BLOB *in_output_buffer,
+                                     uint32_t in_flags);
+NTSTATUS smb2cli_ioctl_recv(struct tevent_req *req,
+                           TALLOC_CTX *mem_ctx,
+                           DATA_BLOB *out_input_buffer,
+                           DATA_BLOB *out_output_buffer);
+NTSTATUS smb2cli_ioctl(struct smbXcli_conn *conn,
+                      uint32_t timeout_msec,
+                      struct smbXcli_session *session,
+                      uint32_t tcon_id,
+                      uint64_t in_fid_persistent,
+                      uint64_t in_fid_volatile,
+                      uint32_t in_ctl_code,
+                      uint32_t in_max_input_length,
+                      const DATA_BLOB *in_input_buffer,
+                      uint32_t in_max_output_length,
+                      const DATA_BLOB *in_output_buffer,
+                      uint32_t in_flags,
+                      TALLOC_CTX *mem_ctx,
+                      DATA_BLOB *out_input_buffer,
+                      DATA_BLOB *out_output_buffer);
+
 #endif /* _SMBXCLI_BASE_H_ */

diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build
index 391c0541d2c2de9933d8ad40e76d5de451780781..40c3c1726ba9063ab6f30fc9592b101885037393 100755 (executable)
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -17,6 +17,7 @@ bld.SAMBA_LIBRARY('cli_smb_common',
                smb2cli_set_info.c
                smb2cli_query_info.c
                smb2cli_query_directory.c
+               smb2cli_ioctl.c
        ''',
        deps='LIBCRYPTO errors gensec krb5samba LIBASYNC_REQ',
        public_deps='talloc samba-util',

diff --git a/source3/Makefile.in b/source3/Makefile.in
index d8ed1b18f137e95fc44de7fd13cca2b91e447411..dce7f7719d9f9ebd44a0b2496690f9b1f411464a 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -627,7 +627,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
             ../libcli/smb/smb2cli_read.o \
             ../libcli/smb/smb2cli_write.o \
             ../libcli/smb/smb2cli_query_directory.o \
-            libsmb/smb2cli_ioctl.o \
+            ../libcli/smb/smb2cli_ioctl.o \
             ../libcli/smb/smb2cli_query_info.o \
             ../libcli/smb/smb2cli_set_info.o \
             libsmb/cli_np_tstream.o \

diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index 6425b8fdc06b1c61c56a84d6ed687e3f5036dbaa..10ea64573470e9d63fe995aff4bbc3b09af14273 100644 (file)
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -37,39 +37,4 @@ 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);
 
-l
-struct tevent_req *smb2cli_ioctl_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,
-                                     uint64_t in_fid_persistent,
-                                     uint64_t in_fid_volatile,
-                                     uint32_t in_ctl_code,
-                                     uint32_t in_max_input_length,
-                                     const DATA_BLOB *in_input_buffer,
-                                     uint32_t in_max_output_length,
-                                     const DATA_BLOB *in_output_buffer,
-                                     uint32_t in_flags);
-NTSTATUS smb2cli_ioctl_recv(struct tevent_req *req,
-                           TALLOC_CTX *mem_ctx,
-                           DATA_BLOB *out_input_buffer,
-                           DATA_BLOB *out_output_buffer);
-NTSTATUS smb2cli_ioctl(struct smbXcli_conn *conn,
-                      uint32_t timeout_msec,
-                      struct smbXcli_session *session,
-                      uint32_t tcon_id,
-                      uint64_t in_fid_persistent,
-                      uint64_t in_fid_volatile,
-                      uint32_t in_ctl_code,
-                      uint32_t in_max_input_length,
-                      const DATA_BLOB *in_input_buffer,
-                      uint32_t in_max_output_length,
-                      const DATA_BLOB *in_output_buffer,
-                      uint32_t in_flags,
-                      TALLOC_CTX *mem_ctx,
-                      DATA_BLOB *out_input_buffer,
-                      DATA_BLOB *out_output_buffer);
-
 #endif /* __SMB2CLI_H__ */

diff --git a/source3/wscript_build b/source3/wscript_build
index 5d9779243b4d0bd01cb91cd2ff52560b9e668d2c..7d8cd6510b6069bbc2c2a8157b635b82d6b70144 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_ioctl.c
              libsmb/cli_np_tstream.c
              libsmb/reparse_symlink.c
              libsmb/clisymlink.c