summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2012-05-15 12:14:47 +0200
committerStefan Metzmacher <metze@samba.org>2012-05-15 18:26:00 +0200
commitb2d9c02665c0a168f29c4fb51d2ba280547ad8c6 (patch)
treee42220742f89b1f4a694dd31534cfbcfb6b40dee
parent22b76de2ffd25e580bd8db61748fa9a6cf62d153 (diff)
downloadsamba-b2d9c02665c0a168f29c4fb51d2ba280547ad8c6.tar.gz
samba-b2d9c02665c0a168f29c4fb51d2ba280547ad8c6.tar.bz2
samba-b2d9c02665c0a168f29c4fb51d2ba280547ad8c6.zip
libcli/smb: move smb2cli_query_info.c from source3 to the toplevel
Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--libcli/smb/smb2cli_query_info.c (renamed from source3/libsmb/smb2cli_query_info.c)9
-rw-r--r--libcli/smb/smbXcli_base.h32
-rwxr-xr-xlibcli/smb/wscript_build1
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/libsmb/smb2cli.h32
-rwxr-xr-xsource3/wscript_build1
6 files changed, 37 insertions, 40 deletions
diff --git a/source3/libsmb/smb2cli_query_info.c b/libcli/smb/smb2cli_query_info.c
index 366dc4a960..30766e4d4e 100644
--- a/source3/libsmb/smb2cli_query_info.c
+++ b/libcli/smb/smb2cli_query_info.c
@@ -18,13 +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 "../librpc/ndr/libndr.h"
+#include "smb_common.h"
+#include "smbXcli_base.h"
struct smb2cli_query_info_state {
uint8_t fixed[0x28];
diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index 8a6dc23c6c..14d33ec678 100644
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -437,4 +437,36 @@ NTSTATUS smb2cli_set_info(struct smbXcli_conn *conn,
uint64_t in_fid_persistent,
uint64_t in_fid_volatile);
+struct tevent_req *smb2cli_query_info_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,
+ uint8_t in_info_type,
+ uint8_t in_file_info_class,
+ uint32_t in_max_output_length,
+ const DATA_BLOB *in_input_buffer,
+ uint32_t in_additional_info,
+ uint32_t in_flags,
+ uint64_t in_fid_persistent,
+ uint64_t in_fid_volatile);
+NTSTATUS smb2cli_query_info_recv(struct tevent_req *req,
+ TALLOC_CTX *mem_ctx,
+ DATA_BLOB *out_output_buffer);
+NTSTATUS smb2cli_query_info(struct smbXcli_conn *conn,
+ uint32_t timeout_msec,
+ struct smbXcli_session *session,
+ uint32_t tcon_id,
+ uint8_t in_info_type,
+ uint8_t in_file_info_class,
+ uint32_t in_max_output_length,
+ const DATA_BLOB *in_input_buffer,
+ uint32_t in_additional_info,
+ uint32_t in_flags,
+ uint64_t in_fid_persistent,
+ uint64_t in_fid_volatile,
+ TALLOC_CTX *mem_ctx,
+ DATA_BLOB *out_output_buffer);
+
#endif /* _SMBXCLI_BASE_H_ */
diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build
index b3b8bcc2d3..f7df3eee41 100755
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -15,6 +15,7 @@ bld.SAMBA_LIBRARY('cli_smb_common',
smb2cli_write.c
smb2cli_flush.c
smb2cli_set_info.c
+ smb2cli_query_info.c
''',
deps='LIBCRYPTO errors gensec krb5samba LIBASYNC_REQ',
public_deps='talloc samba-util',
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4a3ddc1a32..b7a0002f69 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -628,7 +628,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
../libcli/smb/smb2cli_write.o \
libsmb/smb2cli_query_directory.o \
libsmb/smb2cli_ioctl.o \
- libsmb/smb2cli_query_info.o \
+ ../libcli/smb/smb2cli_query_info.o \
../libcli/smb/smb2cli_set_info.o \
libsmb/cli_np_tstream.o \
libsmb/smbsock_connect.o \
diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index 39ce80a613..ee0e6b511d 100644
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -103,36 +103,4 @@ NTSTATUS smb2cli_ioctl(struct smbXcli_conn *conn,
DATA_BLOB *out_input_buffer,
DATA_BLOB *out_output_buffer);
-struct tevent_req *smb2cli_query_info_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,
- uint8_t in_info_type,
- uint8_t in_file_info_class,
- uint32_t in_max_output_length,
- const DATA_BLOB *in_input_buffer,
- uint32_t in_additional_info,
- uint32_t in_flags,
- uint64_t in_fid_persistent,
- uint64_t in_fid_volatile);
-NTSTATUS smb2cli_query_info_recv(struct tevent_req *req,
- TALLOC_CTX *mem_ctx,
- DATA_BLOB *out_output_buffer);
-NTSTATUS smb2cli_query_info(struct smbXcli_conn *conn,
- uint32_t timeout_msec,
- struct smbXcli_session *session,
- uint32_t tcon_id,
- uint8_t in_info_type,
- uint8_t in_file_info_class,
- uint32_t in_max_output_length,
- const DATA_BLOB *in_input_buffer,
- uint32_t in_additional_info,
- uint32_t in_flags,
- uint64_t in_fid_persistent,
- uint64_t in_fid_volatile,
- TALLOC_CTX *mem_ctx,
- DATA_BLOB *out_output_buffer);
-
#endif /* __SMB2CLI_H__ */
diff --git a/source3/wscript_build b/source3/wscript_build
index 19dbead340..141ea4b7a8 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -133,7 +133,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
libsmb/smb2cli_tcon.c
libsmb/smb2cli_query_directory.c
libsmb/smb2cli_ioctl.c
- libsmb/smb2cli_query_info.c
libsmb/cli_np_tstream.c
libsmb/reparse_symlink.c
libsmb/clisymlink.c