diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-09-13 15:50:10 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-01-07 08:37:42 +0100 |
| commit | 024fc73047ffb6bb25dfdfbd99dbd7f490eaaa13 (patch) | |
| tree | c5b43f853ca3c6d32b53a4896dfc95e17d158add | |
| parent | acbd12adf90830070db7e5aec088aa3051dfaa63 (diff) | |
| download | samba-024fc73047ffb6bb25dfdfbd99dbd7f490eaaa13.tar.gz samba-024fc73047ffb6bb25dfdfbd99dbd7f490eaaa13.tar.xz samba-024fc73047ffb6bb25dfdfbd99dbd7f490eaaa13.zip | |
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>
| -rw-r--r-- | libcli/smb/tstream_smbXcli_np.c (renamed from source3/libsmb/cli_np_tstream.c) | 7 | ||||
| -rw-r--r-- | libcli/smb/tstream_smbXcli_np.h (renamed from source3/libsmb/cli_np_tstream.h) | 1 | ||||
| -rwxr-xr-x | libcli/smb/wscript | 2 | ||||
| -rw-r--r-- | source3/rpc_client/rpc_transport_np.c | 2 | ||||
| -rw-r--r-- | source3/rpc_client/rpc_transport_tstream.c | 2 | ||||
| -rwxr-xr-x | source3/wscript_build | 1 |
6 files changed, 7 insertions, 8 deletions
diff --git a/source3/libsmb/cli_np_tstream.c b/libcli/smb/tstream_smbXcli_np.c index 48ff8a37bf..2faad46ead 100644 --- 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 index 2404e7844a..86d64a7230 100644 --- 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 5239010047..f28b7454b4 100755 --- 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 9e0bebb574..11e9b980d7 100644 --- 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 3d47d60402..14cf13220e 100644 --- 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 6bc7b476e6..ecddfd9dca 100755 --- 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 |