summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2012-05-15 12:05:50 +0200
committerStefan Metzmacher <metze@samba.org>2012-05-15 18:26:00 +0200
commit22b76de2ffd25e580bd8db61748fa9a6cf62d153 (patch)
tree04772b57d4eb144c3ff58f21e8232e5b8392f9d8
parent1d7c6bfd7ae02a0b026bb999b462dae4027c7d10 (diff)
downloadsamba-22b76de2ffd25e580bd8db61748fa9a6cf62d153.tar.gz
samba-22b76de2ffd25e580bd8db61748fa9a6cf62d153.tar.bz2
samba-22b76de2ffd25e580bd8db61748fa9a6cf62d153.zip
libcli/smb: move smb2cli_set_info.c from source3 to the toplevel
Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--libcli/smb/smb2cli_set_info.c (renamed from source3/libsmb/smb2cli_set_info.c)9
-rw-r--r--libcli/smb/smbXcli_base.h24
-rwxr-xr-xlibcli/smb/wscript_build1
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/libsmb/smb2cli.h24
-rwxr-xr-xsource3/wscript_build1
6 files changed, 29 insertions, 32 deletions
diff --git a/source3/libsmb/smb2cli_set_info.c b/libcli/smb/smb2cli_set_info.c
index bd595355b6..10da7b1bee 100644
--- a/source3/libsmb/smb2cli_set_info.c
+++ b/libcli/smb/smb2cli_set_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_set_info_state {
uint8_t fixed[0x20];
diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index df6ed31b36..8a6dc23c6c 100644
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -413,4 +413,28 @@ NTSTATUS smb2cli_flush(struct smbXcli_conn *conn,
uint64_t fid_persistent,
uint64_t fid_volatile);
+struct tevent_req *smb2cli_set_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,
+ const DATA_BLOB *in_input_buffer,
+ uint32_t in_additional_info,
+ uint64_t in_fid_persistent,
+ uint64_t in_fid_volatile);
+NTSTATUS smb2cli_set_info_recv(struct tevent_req *req);
+NTSTATUS smb2cli_set_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,
+ const DATA_BLOB *in_input_buffer,
+ uint32_t in_additional_info,
+ uint64_t in_fid_persistent,
+ uint64_t in_fid_volatile);
+
#endif /* _SMBXCLI_BASE_H_ */
diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build
index 5c4fe62123..b3b8bcc2d3 100755
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -14,6 +14,7 @@ bld.SAMBA_LIBRARY('cli_smb_common',
smb2cli_read.c
smb2cli_write.c
smb2cli_flush.c
+ smb2cli_set_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 e45e7fd1ac..4a3ddc1a32 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -629,7 +629,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
libsmb/smb2cli_query_directory.o \
libsmb/smb2cli_ioctl.o \
libsmb/smb2cli_query_info.o \
- libsmb/smb2cli_set_info.o \
+ ../libcli/smb/smb2cli_set_info.o \
libsmb/cli_np_tstream.o \
libsmb/smbsock_connect.o \
$(LIBSAMBA_OBJ) \
diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index 8c8aa3200b..39ce80a613 100644
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -135,28 +135,4 @@ NTSTATUS smb2cli_query_info(struct smbXcli_conn *conn,
TALLOC_CTX *mem_ctx,
DATA_BLOB *out_output_buffer);
-struct tevent_req *smb2cli_set_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,
- const DATA_BLOB *in_input_buffer,
- uint32_t in_additional_info,
- uint64_t in_fid_persistent,
- uint64_t in_fid_volatile);
-NTSTATUS smb2cli_set_info_recv(struct tevent_req *req);
-NTSTATUS smb2cli_set_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,
- const DATA_BLOB *in_input_buffer,
- uint32_t in_additional_info,
- uint64_t in_fid_persistent,
- uint64_t in_fid_volatile);
-
#endif /* __SMB2CLI_H__ */
diff --git a/source3/wscript_build b/source3/wscript_build
index 4f44b0c5a1..19dbead340 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -134,7 +134,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
libsmb/smb2cli_query_directory.c
libsmb/smb2cli_ioctl.c
libsmb/smb2cli_query_info.c
- libsmb/smb2cli_set_info.c
libsmb/cli_np_tstream.c
libsmb/reparse_symlink.c
libsmb/clisymlink.c