diff options
| -rw-r--r-- | libcli/smb/smb2cli_write.c (renamed from source3/libsmb/smb2cli_write.c) | 8 | ||||
| -rw-r--r-- | libcli/smb/smbXcli_base.h | 26 | ||||
| -rwxr-xr-x | libcli/smb/wscript_build | 1 | ||||
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/libsmb/smb2cli.h | 26 | ||||
| -rwxr-xr-x | source3/wscript_build | 1 |
6 files changed, 31 insertions, 33 deletions
diff --git a/source3/libsmb/smb2cli_write.c b/libcli/smb/smb2cli_write.c index d452ffb819..2850cea398 100644 --- 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 3d1f393877..bbc57cfd6d 100644 --- 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 69f9f032ae..9869f19ce2 100755 --- 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 f64bc5b322..b60186d52e 100644 --- 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 0d7ee1faaf..2b3b7fe25d 100644 --- 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 9a68527013..89ccbefe64 100755 --- 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 |