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

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

diff --git a/source3/libsmb/smb2cli_write.c b/libcli/smb/smb2cli_write.c
similarity index 96%
rename from source3/libsmb/smb2cli_write.c
rename to libcli/smb/smb2cli_write.c
index d452ffb8197a9198c458174e6e2d3ca3dd009be9..2850cea3981b875d4ba5b306bf320b49858d60c6 100644 (file)
--- a/source3/libsmb/smb2cli_write.c
+++ b/libcli/smb/smb2cli_write.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_write_state {
        uint8_t fixed[48];

diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index 3d1f393877521785731ddaa4b10750e66ee6743d..bbc57cfd6d0620d269f381500b7bfcc45d05d318 100644 (file)
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -371,4 +371,30 @@ NTSTATUS smb2cli_read(struct smbXcli_conn *conn,
                      uint8_t **data,
                      uint32_t *data_length);
 
+struct tevent_req *smb2cli_write_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,
+                                     uint32_t length,
+                                     uint64_t offset,
+                                     uint64_t fid_persistent,
+                                     uint64_t fid_volatile,
+                                     uint32_t remaining_bytes,
+                                     uint32_t flags,
+                                     const uint8_t *data);
+NTSTATUS smb2cli_write_recv(struct tevent_req *req);
+NTSTATUS smb2cli_write(struct smbXcli_conn *conn,
+                      uint32_t timeout_msec,
+                      struct smbXcli_session *session,
+                      uint32_t tcon_id,
+                      uint32_t length,
+                      uint64_t offset,
+                      uint64_t fid_persistent,
+                      uint64_t fid_volatile,
+                      uint32_t remaining_bytes,
+                      uint32_t flags,
+                      const uint8_t *data);
+
 #endif /* _SMBXCLI_BASE_H_ */

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

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

diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index 0d7ee1faaf2bf43d12be34589ae07c1e79305e20..2b3b7fe25dfc84f1049c66c0aaf09b75d56d1e90 100644 (file)
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -53,32 +53,6 @@ NTSTATUS smb2cli_flush(struct smbXcli_conn *conn,
                       uint64_t fid_persistent,
                       uint64_t fid_volatile);
 
-struct tevent_req *smb2cli_write_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,
-                                     uint32_t length,
-                                     uint64_t offset,
-                                     uint64_t fid_persistent,
-                                     uint64_t fid_volatile,
-                                     uint32_t remaining_bytes,
-                                     uint32_t flags,
-                                     const uint8_t *data);
-NTSTATUS smb2cli_write_recv(struct tevent_req *req);
-NTSTATUS smb2cli_write(struct smbXcli_conn *conn,
-                      uint32_t timeout_msec,
-                      struct smbXcli_session *session,
-                      uint32_t tcon_id,
-                      uint32_t length,
-                      uint64_t offset,
-                      uint64_t fid_persistent,
-                      uint64_t fid_volatile,
-                      uint32_t remaining_bytes,
-                      uint32_t flags,
-                      const uint8_t *data);
-
 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 9a685270138368b292bedaf141cfe8de6469c8f4..89ccbefe645a626afd914c23652a366d8b8c7329 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -132,7 +132,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/clisigning.c
              libsmb/smb2cli_tcon.c
              libsmb/smb2cli_flush.c
-             libsmb/smb2cli_write.c
              libsmb/smb2cli_query_directory.c
              libsmb/smb2cli_ioctl.c
              libsmb/smb2cli_query_info.c