summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-05-15 10:26:25 +0200
committerStefan Metzmacher <metze@samba.org>2012-05-15 18:25:59 +0200
commit4022edc9064e7cde147f0c7cbd93b76db30fac4a (patch)
tree63fb76885e800aee19bf289cbc178b5ebcb0257f
parent2674d0c458410a96d6e33e190a6924e857bbe8be (diff)
downloadsamba-4022edc9064e7cde147f0c7cbd93b76db30fac4a.tar.gz
samba-4022edc9064e7cde147f0c7cbd93b76db30fac4a.tar.bz2
samba-4022edc9064e7cde147f0c7cbd93b76db30fac4a.zip
libcli/smb: move smb2cli_close.c from source3 to the toplevel
metze
-rw-r--r--libcli/smb/smb2cli_close.c (renamed from source3/libsmb/smb2cli_close.c)8
-rw-r--r--libcli/smb/smbXcli_base.h18
-rwxr-xr-xlibcli/smb/wscript_build1
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/libsmb/smb2cli.h18
-rwxr-xr-xsource3/wscript_build1
6 files changed, 23 insertions, 25 deletions
diff --git a/source3/libsmb/smb2cli_close.c b/libcli/smb/smb2cli_close.c
index 1e8d814688..d4cba41416 100644
--- a/source3/libsmb/smb2cli_close.c
+++ b/libcli/smb/smb2cli_close.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_close_state {
uint8_t fixed[24];
diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index 5e5dc2b883..baac22c555 100644
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -325,4 +325,22 @@ NTSTATUS smb2cli_create(struct smbXcli_conn *conn,
uint64_t *fid_persistent,
uint64_t *fid_volatile);
+struct tevent_req *smb2cli_close_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,
+ uint16_t flags,
+ uint64_t fid_persistent,
+ uint64_t fid_volatile);
+NTSTATUS smb2cli_close_recv(struct tevent_req *req);
+NTSTATUS smb2cli_close(struct smbXcli_conn *conn,
+ uint32_t timeout_msec,
+ struct smbXcli_session *session,
+ uint32_t tcon_id,
+ uint16_t flags,
+ uint64_t fid_persistent,
+ uint64_t fid_volatile);
+
#endif /* _SMBXCLI_BASE_H_ */
diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build
index d8bf59e94a..904e895878 100755
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -10,6 +10,7 @@ bld.SAMBA_LIBRARY('cli_smb_common',
smb1cli_trans.c
smb2cli_session.c
smb2cli_create.c
+ smb2cli_close.c
''',
deps='LIBCRYPTO errors gensec krb5samba LIBASYNC_REQ',
public_deps='talloc samba-util',
diff --git a/source3/Makefile.in b/source3/Makefile.in
index c538804364..0d28cfe32c 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -622,7 +622,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
../libcli/smb/smb2cli_create.o \
../libcli/smb/smb2_create_blob.o \
../libcli/smb/smb2_signing.o \
- libsmb/smb2cli_close.o \
+ ../libcli/smb/smb2cli_close.o \
libsmb/smb2cli_flush.o \
libsmb/smb2cli_read.o \
libsmb/smb2cli_write.o \
diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index 6a4e0771e7..98247432eb 100644
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -37,24 +37,6 @@ 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);
-struct tevent_req *smb2cli_close_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,
- uint16_t flags,
- uint64_t fid_persistent,
- uint64_t fid_volatile);
-NTSTATUS smb2cli_close_recv(struct tevent_req *req);
-NTSTATUS smb2cli_close(struct smbXcli_conn *conn,
- uint32_t timeout_msec,
- struct smbXcli_session *session,
- uint32_t tcon_id,
- uint16_t flags,
- uint64_t fid_persistent,
- uint64_t fid_volatile);
-
struct tevent_req *smb2cli_flush_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbXcli_conn *conn,
diff --git a/source3/wscript_build b/source3/wscript_build
index 9e768ccd95..221c354748 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_close.c
libsmb/smb2cli_flush.c
libsmb/smb2cli_read.c
libsmb/smb2cli_write.c