libcli/smb: move source3/libsmb/cli_np_tstream.c to tstream_smbXcli_np.c

This code is generic enough to have it in the top level now.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/libsmb/cli_np_tstream.c b/libcli/smb/tstream_smbXcli_np.c
similarity index 99%
rename from source3/libsmb/cli_np_tstream.c
rename to libcli/smb/tstream_smbXcli_np.c
index 48ff8a37bfd890f9744aa133ff0d45631668421c..2faad46ead20d84c18a4757d4c166ec026df3a33 100644 (file)
--- a/source3/libsmb/cli_np_tstream.c
+++ b/libcli/smb/tstream_smbXcli_np.c
@@ -19,13 +19,12 @@
 
 #include "includes.h"
 #include "system/network.h"
-#include "libsmb/libsmb.h"
-#include "libsmb/smb2cli.h"
-#include "../libcli/smb/smbXcli_base.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "../lib/tsocket/tsocket.h"
 #include "../lib/tsocket/tsocket_internal.h"
-#include "cli_np_tstream.h"
+#include "smb_common.h"
+#include "smbXcli_base.h"
+#include "tstream_smbXcli_np.h"
 #include "libcli/security/security.h"
 
 static const struct tstream_context_ops tstream_cli_np_ops;

diff --git a/source3/libsmb/cli_np_tstream.h b/libcli/smb/tstream_smbXcli_np.h
similarity index 98%
rename from source3/libsmb/cli_np_tstream.h
rename to libcli/smb/tstream_smbXcli_np.h
index 2404e7844aa9a2f1d3799c38dce0c6299c73a23a..86d64a7230425da178be2e27ebb196918c71faed 100644 (file)
--- a/source3/libsmb/cli_np_tstream.h
+++ b/libcli/smb/tstream_smbXcli_np.h
@@ -22,7 +22,6 @@
 
 struct tevent_context;
 struct tevent_req;
-struct cli_state;
 struct tstream_context;
 struct smbXcli_conn;
 struct smbXcli_session;

diff --git a/libcli/smb/wscript b/libcli/smb/wscript
index 523901004742deac1cd0ee115608848105232051..f28b7454b473406c37d9d467e6ceb28f4cca98f0 100755 (executable)
--- a/libcli/smb/wscript
+++ b/libcli/smb/wscript
@@ -38,6 +38,7 @@ def build(bld):
                smb2cli_query_directory.c
                smb2cli_ioctl.c
                smb2cli_echo.c
+                tstream_smbXcli_np.c
        ''',
        deps='LIBCRYPTO errors gensec krb5samba smb_transport',
        public_deps='talloc samba-util',
@@ -49,5 +50,6 @@ def build(bld):
                smb2_lease.h
                smb_util.h
                smb_unix_ext.h
+                tstream_smbXcli_np.h
        ''',
        )

diff --git a/source3/rpc_client/rpc_transport_np.c b/source3/rpc_client/rpc_transport_np.c
index 9e0bebb5742b242aa23307f925ff1d1841da2088..11e9b980d7fd7dacf0638b87c372e538075d7e09 100644 (file)
--- a/source3/rpc_client/rpc_transport_np.c
+++ b/source3/rpc_client/rpc_transport_np.c
@@ -20,9 +20,9 @@
 #include "includes.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "rpc_client/rpc_transport.h"
-#include "libsmb/cli_np_tstream.h"
 #include "librpc/ndr/ndr_table.h"
 #include "libcli/smb/smbXcli_base.h"
+#include "libcli/smb/tstream_smbXcli_np.h"
 #include "client.h"
 
 #undef DBGC_CLASS

diff --git a/source3/rpc_client/rpc_transport_tstream.c b/source3/rpc_client/rpc_transport_tstream.c
index 3d47d60402fd5a52808773fe73a9a1c660861f79..14cf13220e80566c18e0847ef5015f53b367f23f 100644 (file)
--- a/source3/rpc_client/rpc_transport_tstream.c
+++ b/source3/rpc_client/rpc_transport_tstream.c
@@ -21,7 +21,7 @@
 #include "../lib/util/tevent_ntstatus.h"
 #include "rpc_client/rpc_transport.h"
 #include "lib/tsocket/tsocket.h"
-#include "libsmb/cli_np_tstream.h"
+#include "libcli/smb/tstream_smbXcli_np.h"
 #include "cli_pipe.h"
 
 #undef DBGC_CLASS

diff --git a/source3/wscript_build b/source3/wscript_build
index 6bc7b476e67b9e9dc9aa9e1ec15a06b2d4b06ad7..ecddfd9dca6b6c59f54091ea9cd5007ace249661 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -367,7 +367,6 @@ bld.SAMBA3_LIBRARY('libsmb',
                    libsmb/clirap2.c
                    libsmb/async_smb.c
                    libsmb/smb2cli_tcon.c
-                   libsmb/cli_np_tstream.c
                    libsmb/reparse_symlink.c
                    libsmb/clisymlink.c
                    libsmb/smbsock_connect.c