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 1e8d814688d3f2aacb66970f92e413b4fd2e0fed..d4cba414161e32d09f68024b05dd117c8da2ead3 100644 (file)
--- 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 5e5dc2b8830d401830584da6561c801d9dedc7ca..baac22c5557ce2cf2256e1696d509291534c3d92 100644 (file)
--- 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 d8bf59e94a69eddf86f3782afec1ec962e7edb78..904e89587898cea7e23fdf8f1b6ebae9cb552fe8 100755 (executable)
--- 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 c5388043641be55ca190d28fd77952bbba605217..0d28cfe32c35fb84c8b8cd0be2533ab8866087f1 100644 (file)
--- 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 6a4e0771e75a42ef1ea07e93e4202312688586dc..98247432eb411c67de24555213808c9a7b438f57 100644 (file)
--- 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 9e768ccd9567bc292a5f53cc1658524c9684d094..221c354748f313ccd84bcfd378cf71d7dc5a93dc 100755 (executable)
--- 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