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

metze

diff --git a/source3/libsmb/smb2cli_create.c b/libcli/smb/smb2cli_create.c
similarity index 97%
rename from source3/libsmb/smb2cli_create.c
rename to libcli/smb/smb2cli_create.c
index d9800f502478f43d418c20e8a57309cef69fe104..29b0396815d1995a2d639a33c77b9f06e48e84b0 100644 (file)
--- a/source3/libsmb/smb2cli_create.c
+++ b/libcli/smb/smb2cli_create.c
@@ -18,13 +18,11 @@
 */
 
 #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 "libcli/smb/smb2_create_blob.h"
+#include "smb_common.h"
+#include "smbXcli_base.h"
+#include "smb2_create_blob.h"
 
 struct smb2cli_create_state {
        uint8_t fixed[56];

diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index 81fb1fd5826467de4b01129547ba343f7553e90f..5e5dc2b8830d401830584da6561c801d9dedc7ca 100644 (file)
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -290,4 +290,39 @@ NTSTATUS smb2cli_logoff(struct smbXcli_conn *conn,
                        uint32_t timeout_msec,
                        struct smbXcli_session *session);
 
+struct tevent_req *smb2cli_create_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,
+       const char *filename,
+       uint8_t  oplock_level,          /* SMB2_OPLOCK_LEVEL_* */
+       uint32_t impersonation_level,   /* SMB2_IMPERSONATION_* */
+       uint32_t desired_access,
+       uint32_t file_attributes,
+       uint32_t share_access,
+       uint32_t create_disposition,
+       uint32_t create_options,
+       struct smb2_create_blobs *blobs);
+NTSTATUS smb2cli_create_recv(struct tevent_req *req,
+                            uint64_t *fid_persistent,
+                            uint64_t *fid_volatile);
+NTSTATUS smb2cli_create(struct smbXcli_conn *conn,
+                       uint32_t timeout_msec,
+                       struct smbXcli_session *session,
+                       uint32_t tcon_id,
+                       const char *filename,
+                       uint8_t  oplock_level,       /* SMB2_OPLOCK_LEVEL_* */
+                       uint32_t impersonation_level, /* SMB2_IMPERSONATION_* */
+                       uint32_t desired_access,
+                       uint32_t file_attributes,
+                       uint32_t share_access,
+                       uint32_t create_disposition,
+                       uint32_t create_options,
+                       struct smb2_create_blobs *blobs,
+                       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 4447005b11783f32548259f6050345abe78f5352..d8bf59e94a69eddf86f3782afec1ec962e7edb78 100755 (executable)
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -9,6 +9,7 @@ bld.SAMBA_LIBRARY('cli_smb_common',
                smbXcli_base.c
                smb1cli_trans.c
                smb2cli_session.c
+                smb2cli_create.c
        ''',
        deps='LIBCRYPTO errors gensec krb5samba LIBASYNC_REQ',
        public_deps='talloc samba-util',

diff --git a/source3/Makefile.in b/source3/Makefile.in
index c38de5229acdbe5253a74f7381fd930ae8c6a55e..5a18191ef66b4c12288c069472f2ca01b63e5fd2 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -619,7 +619,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
             ../libcli/smb/smb1cli_trans.o \
             ../libcli/smb/smb2cli_session.o \
             libsmb/smb2cli_tcon.o \
-            libsmb/smb2cli_create.o \
+            ../libcli/smb/smb2cli_create.o \
             ../libcli/smb/smb2_create_blob.o \
             ../libcli/smb/smb2_signing.o \
             libsmb/smb2cli_close.o \

diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index 003e0de9567f01d69888a17eb64d1336331afd49..6a4e0771e75a42ef1ea07e93e4202312688586dc 100644 (file)
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -37,41 +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_create_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,
-       const char *filename,
-       uint8_t  oplock_level,          /* SMB2_OPLOCK_LEVEL_* */
-       uint32_t impersonation_level,   /* SMB2_IMPERSONATION_* */
-       uint32_t desired_access,
-       uint32_t file_attributes,
-       uint32_t share_access,
-       uint32_t create_disposition,
-       uint32_t create_options,
-       struct smb2_create_blobs *blobs);
-NTSTATUS smb2cli_create_recv(struct tevent_req *req,
-                            uint64_t *fid_persistent,
-                            uint64_t *fid_volatile);
-NTSTATUS smb2cli_create(struct smbXcli_conn *conn,
-                       uint32_t timeout_msec,
-                       struct smbXcli_session *session,
-                       uint32_t tcon_id,
-                       const char *filename,
-                       uint8_t  oplock_level,       /* SMB2_OPLOCK_LEVEL_* */
-                       uint32_t impersonation_level, /* SMB2_IMPERSONATION_* */
-                       uint32_t desired_access,
-                       uint32_t file_attributes,
-                       uint32_t share_access,
-                       uint32_t create_disposition,
-                       uint32_t create_options,
-                       struct smb2_create_blobs *blobs,
-                       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,

diff --git a/source3/wscript_build b/source3/wscript_build
index 99d7bd80748f0b9c48e75f33b6a3943d29a9b813..9e768ccd9567bc292a5f53cc1658524c9684d094 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_create.c
              libsmb/smb2cli_close.c
              libsmb/smb2cli_flush.c
              libsmb/smb2cli_read.c