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

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

diff --git a/source3/libsmb/smb2cli_flush.c b/libcli/smb/smb2cli_flush.c
similarity index 96%
rename from source3/libsmb/smb2cli_flush.c
rename to libcli/smb/smb2cli_flush.c
index 514fc9387229f50ea37e24181ca5e196c4e78daa..64d47c29c7e06da5d4d6fcd58823547f541023d3 100644 (file)
--- a/source3/libsmb/smb2cli_flush.c
+++ b/libcli/smb/smb2cli_flush.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_flush_state {
        uint8_t fixed[24];

diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index bbc57cfd6d0620d269f381500b7bfcc45d05d318..df6ed31b3617949b1ab36c2aa71a980e1286a997 100644 (file)
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -397,4 +397,20 @@ NTSTATUS smb2cli_write(struct smbXcli_conn *conn,
                       uint32_t flags,
                       const uint8_t *data);
 
+struct tevent_req *smb2cli_flush_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 fid_persistent,
+                                     uint64_t fid_volatile);
+NTSTATUS smb2cli_flush_recv(struct tevent_req *req);
+NTSTATUS smb2cli_flush(struct smbXcli_conn *conn,
+                      uint32_t timeout_msec,
+                      struct smbXcli_session *session,
+                      uint32_t tcon_id,
+                      uint64_t fid_persistent,
+                      uint64_t fid_volatile);
+
 #endif /* _SMBXCLI_BASE_H_ */

diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build
index 9869f19ce2b84e6522a0b05c6f94000c11504246..5c4fe62123a4c85e3c5dfa532b0ef839ea40cfdb 100755 (executable)
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -13,6 +13,7 @@ bld.SAMBA_LIBRARY('cli_smb_common',
                 smb2cli_close.c
                smb2cli_read.c
                smb2cli_write.c
+               smb2cli_flush.c
        ''',
        deps='LIBCRYPTO errors gensec krb5samba LIBASYNC_REQ',
        public_deps='talloc samba-util',

diff --git a/source3/Makefile.in b/source3/Makefile.in
index b60186d52ec3c5390602f6b78dc910243c7344bc..e45e7fd1ac7c87235f8fb17ae2fd1ee2a41833c4 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -623,7 +623,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
             ../libcli/smb/smb2_create_blob.o \
             ../libcli/smb/smb2_signing.o \
             ../libcli/smb/smb2cli_close.o \
-            libsmb/smb2cli_flush.o \
+            ../libcli/smb/smb2cli_flush.o \
             ../libcli/smb/smb2cli_read.o \
             ../libcli/smb/smb2cli_write.o \
             libsmb/smb2cli_query_directory.o \

diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index 2b3b7fe25dfc84f1049c66c0aaf09b75d56d1e90..8c8aa3200b7474b00c7a156e34b49f03e15c9747 100644 (file)
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -37,22 +37,6 @@ 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_flush_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 fid_persistent,
-                                     uint64_t fid_volatile);
-NTSTATUS smb2cli_flush_recv(struct tevent_req *req);
-NTSTATUS smb2cli_flush(struct smbXcli_conn *conn,
-                      uint32_t timeout_msec,
-                      struct smbXcli_session *session,
-                      uint32_t tcon_id,
-                      uint64_t fid_persistent,
-                      uint64_t fid_volatile);
-
 struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx,
                                                struct tevent_context *ev,
                                                struct smbXcli_conn *conn,

diff --git a/source3/wscript_build b/source3/wscript_build
index 89ccbefe645a626afd914c23652a366d8b8c7329..4f44b0c5a19f5765f76c4d6e0de5b41c31a75d28 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_flush.c
              libsmb/smb2cli_query_directory.c
              libsmb/smb2cli_ioctl.c
              libsmb/smb2cli_query_info.c