From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 15 May 2012 08:26:25 +0000 (+0200)
Subject: libcli/smb: move smb2cli_close.c from source3 to the toplevel
X-Git-Tag: samba-4.0.0alpha21~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4022edc9064e7cde147f0c7cbd93b76db30fac4a;p=thirdparty%2Fsamba.git

libcli/smb: move smb2cli_close.c from source3 to the toplevel

metze
---

diff --git a/source3/libsmb/smb2cli_close.c b/libcli/smb/smb2cli_close.c
similarity index 96%
rename from source3/libsmb/smb2cli_close.c
rename to libcli/smb/smb2cli_close.c
index 1e8d814688d..d4cba414161 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 5e5dc2b8830..baac22c5557 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 d8bf59e94a6..904e8958789 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 c5388043641..0d28cfe32c3 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 6a4e0771e75..98247432eb4 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 9e768ccd956..221c354748f 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