diff options
| -rw-r--r-- | libcli/smb/smb2cli_ioctl.c (renamed from source3/libsmb/smb2cli_ioctl.c) | 10 | ||||
| -rw-r--r-- | libcli/smb/smbXcli_base.h | 34 | ||||
| -rwxr-xr-x | libcli/smb/wscript_build | 1 | ||||
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/libsmb/smb2cli.h | 35 | ||||
| -rwxr-xr-x | source3/wscript_build | 1 |
6 files changed, 40 insertions, 43 deletions
diff --git a/source3/libsmb/smb2cli_ioctl.c b/libcli/smb/smb2cli_ioctl.c index c80ae49a58..2881c742ce 100644 --- 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 9d0db39eb8..81a8e93ade 100644 --- 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 391c0541d2..40c3c1726b 100755 --- 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 d8ed1b18f1..dce7f7719d 100644 --- 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 6425b8fdc0..10ea645734 100644 --- 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 5d9779243b..7d8cd6510b 100755 --- 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 |