libsmb: Remove "source3/libsmb/libsmb.h"

libsmb.h added ads_status.h and cli_smb2_fnum.h. Only few users need
either.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/lib/fuzzing/fuzz_nmblib_parse_packet.c b/lib/fuzzing/fuzz_nmblib_parse_packet.c
index c8a2d035ef73308ce6f3223aa0e4652396240fd5..7c0de12b9f44d1c4c861bcaab5ccacc1eeacb8c0 100644 (file)
--- a/lib/fuzzing/fuzz_nmblib_parse_packet.c
+++ b/lib/fuzzing/fuzz_nmblib_parse_packet.c
@@ -17,7 +17,7 @@
 */
 
 #include "../../source3/include/includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/proto.h"
 #include "libsmb/nmblib.h"
 #include "fuzzing/fuzzing.h"
 

diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
index 31d510db2a2ca6e20228aeb75ba388b6fa44e6f2..2449ae4bcb642541f0cd54ae4a5cc59210bb3f42 100644 (file)
--- a/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -23,7 +23,6 @@
 #include "../libgpo/gpo_ini.h"
 
 #include "libgpo/gpo_proto.h"
-#include "libsmb/libsmb.h"
 
 /****************************************************************
  explode the GPO CIFS URI into their components

diff --git a/libgpo/gpo_filesync.c b/libgpo/gpo_filesync.c
index b0d1447bd85dd3cc28668e5ec67efa5edaacafc1..07234dc37a48d5995606475df517e98a1f6a24fd 100644 (file)
--- a/libgpo/gpo_filesync.c
+++ b/libgpo/gpo_filesync.c
@@ -19,7 +19,8 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../libgpo/gpo.h"
 #include "libgpo/gpo_proto.h"
 #include "lib/util/string_wrappers.h"

diff --git a/source3/client/client.c b/source3/client/client.c
index e448ded6b6e05cf02235363e380dc02f06105c50..7857f7e56f5dca1a5dbaad10ab3d89aa1fa8f263 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -32,7 +32,8 @@
 #include "../libcli/smbreadline/smbreadline.h"
 #include "../libcli/security/security.h"
 #include "system/select.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/smbsock_connect.h"
 #include "libsmb/clirap.h"
 #include "trans2.h"

diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 2a1efdaf37becd86d343cf5db719ea83b20f6c7b..28745d7da44419d17754221a7dff53ad82e9dbd2 100644 (file)
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -70,7 +70,8 @@
 #include "system/filesys.h"
 #include "client/client_proto.h"
 #include "client/clitar_proto.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "lib/util/util_file.h"
 
 #ifdef HAVE_LIBARCHIVE

diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 56661b983368eeb9114e7398f49be567978784de..c056cc769962a3f628de54bf49d664baa35e66b1 100644 (file)
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -26,7 +26,8 @@
 #include "system/filesys.h"
 #include "system/passwd.h"
 #include "system/kerberos.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/smbsock_connect.h"
 #include "lib/param/param.h"
 #include "lib/krb5_wrap/krb5_samba.h"

diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index c7a3a0873d68c1fedabf8960f1e4413024270613..db3e2d2389146eb025be804c53a544a2b242c67c 100644 (file)
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -21,7 +21,8 @@
 
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "rpc_client/cli_pipe.h"
 #include "../libcli/smb/smbXcli_base.h"
 

diff --git a/source3/lib/util_sd.c b/source3/lib/util_sd.c
index 23f37b7e7347315a2066ab39816ae23891a8cec0..86e375cb0dd8f3a95157c6a7843dac80caa1116e 100644 (file)
--- a/source3/lib/util_sd.c
+++ b/source3/lib/util_sd.c
@@ -22,7 +22,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "util_sd.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "../libcli/security/security.h"

diff --git a/source3/libads/trusts_util.c b/source3/libads/trusts_util.c
index 6a39f32f350aa9940a4dd0f0fe0b3dc4cab36260..9bea87990b6df9c553f08e4f17b745a6f0ea275f 100644 (file)
--- a/source3/libads/trusts_util.c
+++ b/source3/libads/trusts_util.c
@@ -29,7 +29,6 @@
 #include "secrets.h"
 #include "ads.h"
 #include "passdb.h"
-#include "libsmb/libsmb.h"
 #include "source3/include/messages.h"
 #include "source3/include/g_lock.h"
 #include "lib/util/util_tdb.h"

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 439bd2c01a92310dedf9d0008c289d7005fb9d8c..c33724494aad1c6466f246bc86c3e63159fc59e0 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -19,6 +19,8 @@
  */
 
 #include "includes.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "ads.h"
 #include "libsmb/namequery.h"
 #include "librpc/gen_ndr/ndr_libnet_join.h"
@@ -35,10 +37,10 @@
 #include "../libds/common/flags.h"
 #include "secrets.h"
 #include "rpc_client/init_lsa.h"
+
 #include "rpc_client/cli_pipe.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"
-#include "libsmb/libsmb.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "lib/param/loadparm.h"
 #include "libcli/auth/netlogon_creds_cli.h"

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 3e626d1cc8c12dda5ede63dcd78e857a827c2beb..8c8003c5641b22aa501246257c7caf5a168adab9 100644 (file)
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "../libcli/smb/smbXcli_base.h"

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index d83a820f9e1d6a87b2ce9285ad2d284c9481578e..9dfdb8aefae581d3d196bb29a8a8afbf2531279f 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -21,7 +21,9 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "libads/ads_status.h"
 #include "libsmb/namequery.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "auth/credentials/credentials.h"

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index cafb1b421a6076d86d181010afd8f71b313457f1..cb0d8a88eccdcd65059a338e8c88c1da7c002028 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -20,7 +20,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "msdfs.h"
 #include "trans2.h"

diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index c87c870345f3156981acfe418182817698c1c051..719da9d5c5020a6261bf00dafa357a366f80f841 100644 (file)
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "libsmb/clidgram.h"
 #include "libsmb/nmblib.h"

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index d699f035847c04d566d2d72aa4f2ed98bb13cb26..f9d756fcd5fbcc9561994c485952191c19e9c14c 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -19,7 +19,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "../libcli/smb/smb_signing.h"
 #include "../libcli/smb/smb_seal.h"

diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c
index 3a024ea22e3c0130a18e8a970a6d4d002401db00..d443cf7255bdb6a1b4d32c19710bc6306ec8932f 100644 (file)
--- a/source3/libsmb/clierror.c
+++ b/source3/libsmb/clierror.c
@@ -20,7 +20,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../libcli/smb/smbXcli_base.h"
 
 int cli_status_to_errno(NTSTATUS status)

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index c079f84049e52211504465c3a5597cec79ef574e..981829c0e37d4d9f978ae70098b02695cef5b849 100644 (file)
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -20,7 +20,9 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "libsmb/clirap.h"

diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 4b82a0bd1e971c3b4d8808cc473ab5fc8a08b2c9..ded07f21a9afb247efb81e48280bd5813cb8de07 100644 (file)
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -20,7 +20,9 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "trans2.h"

diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index d8951482bacaf1e4675fc13b06c17dced9654a57..f954405ba1025fa376f46f9ccedbce1320ac367f 100644 (file)
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -18,7 +18,9 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "trans2.h"

diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c
index 856361589f5098e5daad3b162ada91476a3ff78e..2f6a1848955cc385d980636c8614e6eb33a29f56 100644 (file)
--- a/source3/libsmb/climessage.c
+++ b/source3/libsmb/climessage.c
@@ -20,7 +20,8 @@
 #include "includes.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../libcli/smb/smbXcli_base.h"
 
 struct cli_message_start_state {

diff --git a/source3/libsmb/clioplock.c b/source3/libsmb/clioplock.c
index aee09da41ec23e64089204dbc398505f37072ede..0ff910452014a81581b3024a8cbabc3f50db995d 100644 (file)
--- a/source3/libsmb/clioplock.c
+++ b/source3/libsmb/clioplock.c
@@ -20,7 +20,8 @@
 #include "includes.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../libcli/smb/smbXcli_base.h"
 
 struct cli_smb_oplock_break_waiter_state {

diff --git a/source3/libsmb/cliprint.c b/source3/libsmb/cliprint.c
index 3808811cccdf715cf673e62dd12fb7ad6bfddc14..728b7da29045351974f77d5229fe24e35f8d3743 100644 (file)
--- a/source3/libsmb/cliprint.c
+++ b/source3/libsmb/cliprint.c
@@ -18,7 +18,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "lib/util/string_wrappers.h"

diff --git a/source3/libsmb/cliquota.c b/source3/libsmb/cliquota.c
index 0c41272f21a0075058751ccdd554ba57032adb2f..865a41ff6188600defd5050c28016bda7a58ed50 100644 (file)
--- a/source3/libsmb/cliquota.c
+++ b/source3/libsmb/cliquota.c
@@ -18,7 +18,9 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "fake_file.h"
 #include "../libcli/security/security.h"

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index 758d6ccbb1e1c11b6e102d55b53f2accb383e1e9..99762443cb5165cac2c28a76a9e2a51aa01985d3 100644 (file)
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -24,7 +24,8 @@
 #include "../librpc/gen_ndr/rap.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "trans2.h"
 #include "../libcli/smb/smbXcli_base.h"

diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 0dfcd479cc0c4bc2c68dfc8206ebf28422bdeea7..a7bef4497e5fd1eabb9f4c95849f0249d21d7163 100644 (file)
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -18,7 +18,9 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "trans2.h"

diff --git a/source3/libsmb/clisecdesc.c b/source3/libsmb/clisecdesc.c
index 853e46a0f0a246740c0c91fc74bfeb69b4538430..32558c148c9b111e9d8b50f3c50878e68729fc42 100644 (file)
--- a/source3/libsmb/clisecdesc.c
+++ b/source3/libsmb/clisecdesc.c
@@ -18,7 +18,9 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "../libcli/security/secdesc.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "lib/util/tevent_ntstatus.h"

diff --git a/source3/libsmb/clisymlink.c b/source3/libsmb/clisymlink.c
index d7ecf5457614c3ed07f25a4873414391dd5f6638..c8632cde8483bf259fe7839d5ed418d4aa745666 100644 (file)
--- a/source3/libsmb/clisymlink.c
+++ b/source3/libsmb/clisymlink.c
@@ -19,7 +19,8 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "libsmb/clirap.h"

diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index 2cd75d2a800baa140e2bcb0e6350ab7b1a73843d..5a53f762200a71ca54badfda7876fd2f150de968 100644 (file)
--- a/source3/libsmb/clitrans.c
+++ b/source3/libsmb/clitrans.c
@@ -18,7 +18,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "../libcli/smb/smbXcli_base.h"

diff --git a/source3/libsmb/libsmb.h b/source3/libsmb/libsmb.h
deleted file mode 100644 (file)
index 6df06ae..0000000
--- a/source3/libsmb/libsmb.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-
-   Copyright (C) Andrew Tridgell 1992-1998,2001
-   Copyright (C) Jeremy Allison 1998
-   Copyright (C) Remus Koos 2001
-   Copyright (C) Andrew Bartlett 2001
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _LIBSMB_LIBSMB_H
-#define _LIBSMB_LIBSMB_H
-
-#include "client.h"
-#include "libads/ads_status.h"
-#include "libsmb/proto.h"
-#include "libsmb/cli_smb2_fnum.h"
-
-#endif /* _LIBSMB_LIBSMB_H */

diff --git a/source3/libsmb/libsmb_cache.c b/source3/libsmb/libsmb_cache.c
index 91292b1b3e2bf22ee548b9c01cc400eab1d1651d..227f876655c980d35889f2a889a4ab35d27ab90f 100644 (file)
--- a/source3/libsmb/libsmb_cache.c
+++ b/source3/libsmb/libsmb_cache.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 

diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index 55847f6b970e499b4914d0a7e8b8e9a5252f681e..25052f84da3eb7dcf8b92cc026325b7f620d39c8 100644 (file)
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -23,7 +23,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "secrets.h"

diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index 1d2743df56b03703ab51092f4809d91e4278d93d..8f98da1b28aa2c5cd5bc176657402a037ee02374 100644 (file)
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -24,7 +24,8 @@
 
 #include "includes.h"
 #include "libsmb/namequery.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "rpc_client/cli_pipe.h"

diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index f329763edd54fcfaa8fca570d1832c949ff9d59b..2b29287200f95802045e8cfd68a7c3db057968eb 100644 (file)
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -23,7 +23,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "../libcli/smb/smbXcli_base.h"

diff --git a/source3/libsmb/libsmb_misc.c b/source3/libsmb/libsmb_misc.c
index 450989567fcfaec379f5459d500af0b38e29ea53..e17f2bae99c98679f38be3679b16a58173313362 100644 (file)
--- a/source3/libsmb/libsmb_misc.c
+++ b/source3/libsmb/libsmb_misc.c
@@ -23,7 +23,6 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 

diff --git a/source3/libsmb/libsmb_printjob.c b/source3/libsmb/libsmb_printjob.c
index 2b05dd077cff58568223bb04fc3bc3dc705fe33e..62955d32ce364e12e3ce8ec26b8a9fd6a15dda9e 100644 (file)
--- a/source3/libsmb/libsmb_printjob.c
+++ b/source3/libsmb/libsmb_printjob.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index c27f85d72dc9a51537adf5b80961a7247d1be79c..f9b52e1f05a6ccae17815e6d5882c31962c16da9 100644 (file)
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -24,7 +24,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"

diff --git a/source3/libsmb/libsmb_stat.c b/source3/libsmb/libsmb_stat.c
index 1e886fc9920d6a923d8114b9e83ff36147e2b0ee..56192b61333a5fc25743340adffb29d6a3f2c1b5 100644 (file)
--- a/source3/libsmb/libsmb_stat.c
+++ b/source3/libsmb/libsmb_stat.c
@@ -23,7 +23,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "../libcli/smb/smbXcli_base.h"

diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index 8ebddec96bba8c1ff505bb69c062513d3d4bfdd9..79555e5923e2dc54f8e1e0fa9eca46102795602a 100644 (file)
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -23,7 +23,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"

diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index eafad9a0423a405e38cac06883dac10fcb09edb3..bd57349b574564a2ad7ada3cf88645801d6ed484 100644 (file)
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -21,7 +21,8 @@
 #include "../librpc/gen_ndr/ndr_samr.h"
 #include "rpc_client/cli_pipe.h"
 #include "rpc_client/cli_samr.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "libsmb/nmblib.h"
 #include "../libcli/smb/smbXcli_base.h"

diff --git a/source3/libsmb/pylibsmb.c b/source3/libsmb/pylibsmb.c
index 87dc460c0fe121b3c8e290f1a335ba6cf2cf6b35..67872d8e3b1f02f9520ecec044b7e2b0c0ba073c 100644 (file)
--- a/source3/libsmb/pylibsmb.c
+++ b/source3/libsmb/pylibsmb.c
@@ -53,7 +53,9 @@ c = libsmb.Conn("127.0.0.1",
 #include "libcli/smb/smbXcli_base.h"
 #include "libcli/smb/smb2_negotiate_context.h"
 #include "libcli/smb/reparse.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
 #include "libcli/security/security.h"
 #include "system/select.h"
 #include "source4/libcli/util/pyerrors.h"

diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index 1da365762e651ace034cc5e2845491fa06805b1e..d2f410e8cce6a0b0ddae8400ea8d824332ffeb76 100644 (file)
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -23,7 +23,6 @@
 #include "nmbd/nmbd.h"
 #include "../lib/util/select.h"
 #include "system/select.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/unexpected.h"
 #include "lib/util/string_wrappers.h"
 

diff --git a/source3/nmbd/nmbd_synclists.c b/source3/nmbd/nmbd_synclists.c
index 0523a902af2cd1e0919f90e20a6b691ab2afe97b..623db9f47ca1f8762fe21f910bfce858cfbcca8c 100644 (file)
--- a/source3/nmbd/nmbd_synclists.c
+++ b/source3/nmbd/nmbd_synclists.c
@@ -29,7 +29,8 @@
 #include "system/filesys.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "nmbd/nmbd.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "lib/util/string_wrappers.h"

diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 2c2053ef910c4ffa17af0db8416c821769d8eeb3..15ca6227a373066ff51f8aecbaaeef9c4a21dcfa 100644 (file)
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "libsmb/libsmb.h"
 #include "rpc_client/rpc_client.h"
 #include "rpc_client/cli_pipe.h"
 #include "../libcli/auth/libcli_auth.h"

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 23adbbc62faab57c5850fec18b47ecfaaac99c9b..e3f48526492406f3164b55fb9f01c44da0b2a65c 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -37,7 +37,8 @@
 #include "librpc/rpc/dcerpc_util.h"
 #include "rpc_dce.h"
 #include "cli_pipe.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "auth/gensec/gensec.h"
 #include "auth/credentials/credentials.h"
 #include "auth/auth_util.h"

diff --git a/source3/rpc_client/cli_pipe_schannel.c b/source3/rpc_client/cli_pipe_schannel.c
index 23d3ba486af6e0761727b8ae792fc1adc3481efb..b688b614686f37c7f08bcf3e919567a80277a293 100644 (file)
--- a/source3/rpc_client/cli_pipe_schannel.c
+++ b/source3/rpc_client/cli_pipe_schannel.c
@@ -25,7 +25,6 @@
 #include "rpc_client/cli_pipe.h"
 #include "librpc/rpc/dcerpc.h"
 #include "passdb.h"
-#include "libsmb/libsmb.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "libcli/auth/netlogon_creds_cli.h"
 #include "auth/gensec/gensec.h"

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index fa82ba41034b300f4c7da0f1a266ecd43581d053..696259a87bf92a6a6b28733bf33d6b9737e5d285 100644 (file)
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -54,7 +54,8 @@
 #include "messages.h"
 #include "rpc_server/spoolss/srv_spoolss_nt.h"
 #include "util_tdb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "printing/printer_list.h"
 #include "../lib/tsocket/tsocket.h"
 #include "rpc_client/cli_winreg_spoolss.h"

diff --git a/source3/rpcclient/cmd_iremotewinspool.c b/source3/rpcclient/cmd_iremotewinspool.c
index 7162605696f0f155c5fb2998927ac074816b38f1..9782f7119384a1d89155e79ad3af2e2bf7500d83 100644 (file)
--- a/source3/rpcclient/cmd_iremotewinspool.c
+++ b/source3/rpcclient/cmd_iremotewinspool.c
@@ -21,7 +21,6 @@
 #include "includes.h"
 #include "rpcclient.h"
 #include "../librpc/gen_ndr/ndr_winspool.h"
-#include "libsmb/libsmb.h"
 #include "auth/gensec/gensec.h"
 #include "auth/credentials/credentials.h"
 #include "rpc_client/init_spoolss.h"

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 8d98fc278097674f8ec4206a6666dcc12d84f8b0..53636608ef5e203e117dfc4a40a3d3b6fda35e82 100644 (file)
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -32,7 +32,8 @@
 #include "../libcli/security/display_sec.h"
 #include "../libcli/security/security_descriptor.h"
 #include "../libcli/registry/util_reg.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "lib/util/smb_strtox.h"
 #include "lib/util/string_wrappers.h"
 #include "lib/cmdline/cmdline.h"

diff --git a/source3/rpcclient/cmd_spotlight.c b/source3/rpcclient/cmd_spotlight.c
index ba3f61fd4b0603f167b605d348d446a3bcffd8fb..df837f78f455b806e19d95bd88d5f3e2b0b97f90 100644 (file)
--- a/source3/rpcclient/cmd_spotlight.c
+++ b/source3/rpcclient/cmd_spotlight.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "rpcclient.h"
-#include "libsmb/libsmb.h"
 #include "../librpc/gen_ndr/ndr_mdssvc_c.h"
 #include "../rpc_server/mdssvc/mdssvc.h"
 #include "../rpc_server/mdssvc/dalloc.h"

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 37b78b8ffef3165c6efeb9f4bf62baa6caf65597..2ce8cc0ad54e071fa88f10b4d44f8b6f3641a89e 100644 (file)
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -30,7 +30,8 @@
 #include "../libcli/smbreadline/smbreadline.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/smbsock_connect.h"
 #include "auth/gensec/gensec.h"
 #include "../libcli/smb/smbXcli_base.h"

diff --git a/source3/smbd/ntquotas.c b/source3/smbd/ntquotas.c
index 5705a4f13ad9041b6b3594d15105718bb41ccd2c..dbbd2f7842cb16049e7409ab03625c4e1c407d15 100644 (file)
--- a/source3/smbd/ntquotas.c
+++ b/source3/smbd/ntquotas.c
@@ -22,7 +22,8 @@
 #include "../lib/util/util_pw.h"
 #include "system/passwd.h"
 #include "passdb/lookup_sid.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libcli/security/dom_sid.h"
 
 #undef DBGC_CLASS

diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 0f1ceaf40446e0b42795990ddd0d4886d69adbf3..958cbcaa6aa423e053285cf1b3c5eaee1df65457 100644 (file)
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -22,7 +22,6 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_seal.h"
 #include "auth.h"
-#include "libsmb/libsmb.h"
 #include "../lib/tsocket/tsocket.h"
 #include "auth/gensec/gensec.h"
 

diff --git a/source3/smbd/smb1_nttrans.c b/source3/smbd/smb1_nttrans.c
index 1d2bae76f897abe41e74b605257a83b5f0fd0cc8..61f9c82f1850e90b51f472cf06bdb2fac31da656 100644 (file)
--- a/source3/smbd/smb1_nttrans.c
+++ b/source3/smbd/smb1_nttrans.c
@@ -28,7 +28,6 @@
 #include "passdb/lookup_sid.h"
 #include "auth.h"
 #include "smbprofile.h"
-#include "libsmb/libsmb.h"
 #include "lib/util_ea.h"
 #include "librpc/gen_ndr/ndr_quota.h"
 #include "librpc/gen_ndr/ndr_security.h"

diff --git a/source3/smbd/smb2_nttrans.c b/source3/smbd/smb2_nttrans.c
index 19e78ab1394758004c857039df090f8753e8399d..06eb04c8a07a8aa379bf4257ade4fc5c24125afe 100644 (file)
--- a/source3/smbd/smb2_nttrans.c
+++ b/source3/smbd/smb2_nttrans.c
@@ -28,7 +28,7 @@
 #include "passdb/lookup_sid.h"
 #include "auth.h"
 #include "smbprofile.h"
-#include "libsmb/libsmb.h"
+#include "source3/libsmb/proto.h"
 #include "lib/util_ea.h"
 #include "librpc/gen_ndr/ndr_quota.h"
 #include "librpc/gen_ndr/ndr_security.h"

diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index 34497c3b9bbcd8089f71ce9e231cb143cea95be0..ed35bcbdf09c4d4e435f3ce4e7d1b56b283ec42c 100644 (file)
--- a/source3/torture/denytest.c
+++ b/source3/torture/denytest.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 
 extern bool torture_showall;
 

diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 35b40c12d8bb542363842aff98f1a42486eaf97f..36c6479e58456663eb143f62c626c045a4e15b32 100644 (file)
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -18,7 +18,8 @@
 */
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "system/filesys.h"
 #include "locking/share_mode_lock.h"
 #include "locking/proto.h"

diff --git a/source3/torture/mangle_test.c b/source3/torture/mangle_test.c
index 92754b9eeb62ae14f1cda597f569418d9a1f17b9..b6cd08358e085772a50f2594fa80ac8f685354a8 100644 (file)
--- a/source3/torture/mangle_test.c
+++ b/source3/torture/mangle_test.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "util_tdb.h"
 #include "lib/util/string_wrappers.h"

diff --git a/source3/torture/nbench.c b/source3/torture/nbench.c
index 8646d7a9b7cbab5b697f55ad2544420d3dc76824..64ee117a40d3fb0eda0ae6f26997688a92a0785d 100644 (file)
--- a/source3/torture/nbench.c
+++ b/source3/torture/nbench.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "../lib/util/tevent_ntstatus.h"
 

diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c
index 4fedfc59912351aba5ca3d690fb6dbfc71dc924e..820cb07c564649884e52915e0a08ea825ba68eca 100644 (file)
--- a/source3/torture/nbio.c
+++ b/source3/torture/nbio.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "torture/proto.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 
 #define MAX_FILES 1000

diff --git a/source3/torture/proto.h b/source3/torture/proto.h
index 26b51209639ce84e54bbab45092cbe49e2d78667..8783776a2c3bb2e66c3d20cbd35e8286d2aa2f0e 100644 (file)
--- a/source3/torture/proto.h
+++ b/source3/torture/proto.h
@@ -23,7 +23,8 @@
 #ifndef __TORTURE_H__
 #define __TORTURE_H__
 
-struct cli_state;
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 
 /* The following definitions come from torture/denytest.c  */
 

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index ad44f33dd9c05abbb04faa1eb843ca7127b4dcb6..161e04cdaeba943865d180110b2c605e24ae87f8 100644 (file)
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "../libcli/smb/smbXcli_base.h"
 
 #define VERBOSE 0

diff --git a/source3/torture/test_async_echo.c b/source3/torture/test_async_echo.c
index f21daa4485cd18453a3bdb8b349f1b66c514e8b7..fab9267a935add87c41ffe9599a2cd69988dd225 100644 (file)
--- a/source3/torture/test_async_echo.c
+++ b/source3/torture/test_async_echo.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "rpc_client/cli_pipe.h"
 #include "librpc/gen_ndr/ndr_echo_c.h"
 

diff --git a/source3/torture/test_buffersize.c b/source3/torture/test_buffersize.c
index 217b1486efa5e65f3d670385017d0da0afe6cea3..731c2195cbe478289e5d26f7fc17e364aeb13902 100644 (file)
--- a/source3/torture/test_buffersize.c
+++ b/source3/torture/test_buffersize.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libcli/security/dom_sid.h"
 #include "libcli/security/secdesc.h"
 #include "libcli/security/security.h"

diff --git a/source3/torture/test_case_insensitive.c b/source3/torture/test_case_insensitive.c
index 04e2dce2a791e651192d756c9e4dc52983cd5f1d..8921b15ea561f74cb9f452d79913e5267313c16b 100644 (file)
--- a/source3/torture/test_case_insensitive.c
+++ b/source3/torture/test_case_insensitive.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "torture/proto.h"
 #include "system/filesys.h"
-#include "libsmb/libsmb.h"
 
 /*
  * Regression test file creates on case insensitive file systems (e.g. OS/X)

diff --git a/source3/torture/test_chain3.c b/source3/torture/test_chain3.c
index 5320ef898f0b3ef1933f4c309b2b230948c95e7a..f4b056e8e4a8fb31298a3469ab33c7fc58777f34 100644 (file)
--- a/source3/torture/test_chain3.c
+++ b/source3/torture/test_chain3.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "system/filesys.h"
 #include "async_smb.h"
 #include "lib/util/tevent_ntstatus.h"

diff --git a/source3/torture/test_cleanup.c b/source3/torture/test_cleanup.c
index 2ff5cf6f31feae3df43bd3a492d91ebf88a6c6c9..ff62870e227a50187ac4c800d9c4a077cd50324e 100644 (file)
--- a/source3/torture/test_cleanup.c
+++ b/source3/torture/test_cleanup.c
@@ -22,7 +22,6 @@
 #include "torture/proto.h"
 #include "system/filesys.h"
 #include "system/select.h"
-#include "libsmb/libsmb.h"
 #include "libcli/smb/smbXcli_base.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/open_files.h"

diff --git a/source3/torture/test_hidenewfiles.c b/source3/torture/test_hidenewfiles.c
index 6d6811c7684448f077f443ba90a19c5976da7283..82a66a76f5459e7f988ab6fa5576340c08522f17 100644 (file)
--- a/source3/torture/test_hidenewfiles.c
+++ b/source3/torture/test_hidenewfiles.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libcli/security/security.h"
 
 static NTSTATUS servertime(

diff --git a/source3/torture/test_notify.c b/source3/torture/test_notify.c
index b265845f8222db25290c9da23fcd5cee26edf936..6fc4c6f642bfeb1a7b374836e3900d55ceed39d7 100644 (file)
--- a/source3/torture/test_notify.c
+++ b/source3/torture/test_notify.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "libcli/security/security.h"
 #include "lib/tevent_barrier.h"

diff --git a/source3/torture/test_notify_online.c b/source3/torture/test_notify_online.c
index d8a5d37e33f15bd9b506190f672dcff35a2d561a..d3c9f44d25c100ae22da3f6db8d88ad426e50378 100644 (file)
--- a/source3/torture/test_notify_online.c
+++ b/source3/torture/test_notify_online.c
@@ -21,7 +21,6 @@
 #include "torture/proto.h"
 #include "libcli/security/security.h"
 #include "lib/util/tevent_ntstatus.h"
-#include "libsmb/libsmb.h"
 
 extern char *test_filename;
 

diff --git a/source3/torture/test_nttrans_create.c b/source3/torture/test_nttrans_create.c
index 5e7ce7e16c388e184ac41f035a16e7da622ef659..143c728bd756db58bf15f326b21f7766572a5837 100644 (file)
--- a/source3/torture/test_nttrans_create.c
+++ b/source3/torture/test_nttrans_create.c
@@ -19,7 +19,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libcli/security/dom_sid.h"
 #include "libcli/security/secdesc.h"
 #include "libcli/security/security.h"

diff --git a/source3/torture/test_nttrans_fsctl.c b/source3/torture/test_nttrans_fsctl.c
index aea80c5431d5fa0c83bde897b3521fe6d3c2d9f2..401f9b05112177d250d6fd305bdb312d11e392b0 100644 (file)
--- a/source3/torture/test_nttrans_fsctl.c
+++ b/source3/torture/test_nttrans_fsctl.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libcli/security/security.h"
 
 bool run_nttrans_fsctl(int dummy)

diff --git a/source3/torture/test_oplock_cancel.c b/source3/torture/test_oplock_cancel.c
index 86ce5b76d77c1982f69172e7cc5da9a435afce0e..403c03c979e499593564e7a2b8641ff00183009f 100644 (file)
--- a/source3/torture/test_oplock_cancel.c
+++ b/source3/torture/test_oplock_cancel.c
@@ -22,7 +22,6 @@
 #include "torture/proto.h"
 #include "system/filesys.h"
 #include "system/select.h"
-#include "libsmb/libsmb.h"
 #include "libcli/smb/smbXcli_base.h"
 #include "libcli/security/security.h"
 #include "lib/util/tevent_ntstatus.h"

diff --git a/source3/torture/test_posix.c b/source3/torture/test_posix.c
index 07185615dd5a6e5ebcadfa160e077aff1860c727..00d87e94a7e766c76de2a06c617114e13f414ca6 100644 (file)
--- a/source3/torture/test_posix.c
+++ b/source3/torture/test_posix.c
@@ -19,7 +19,6 @@
 #include "includes.h"
 #include "torture/proto.h"
 #include "libcli/security/security.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "libsmb/proto.h"
 #include "../libcli/smb/smbXcli_base.h"

diff --git a/source3/torture/test_posix_append.c b/source3/torture/test_posix_append.c
index 3abd448ab7b56e6b02846da466d9e8db6c706d5a..cc61941736abd8102a9ae87fe3c22c16bb7771f4 100644 (file)
--- a/source3/torture/test_posix_append.c
+++ b/source3/torture/test_posix_append.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "torture/proto.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 
 /*

diff --git a/source3/torture/test_readdir_timestamp.c b/source3/torture/test_readdir_timestamp.c
index 0eba415c8b45ce93634df6e7e0ed329a8883a28d..0468fc2aac8746a896c59af8b99720d9b07e28dc 100644 (file)
--- a/source3/torture/test_readdir_timestamp.c
+++ b/source3/torture/test_readdir_timestamp.c
@@ -18,7 +18,6 @@
 
 #include "includes.h"
 #include "torture/proto.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "lib/util/smb_strtox.h"

diff --git a/source3/torture/test_rpc_scale.c b/source3/torture/test_rpc_scale.c
index 6ef26f37a9971dbf30f775b99a09fc5be97a4356..3445bed3ecbaaab7469203f438a96824ce7770a3 100644 (file)
--- a/source3/torture/test_rpc_scale.c
+++ b/source3/torture/test_rpc_scale.c
@@ -17,7 +17,6 @@
 
 #include "source3/include/includes.h"
 #include "source3/torture/proto.h"
-#include "source3/libsmb/libsmb.h"
 #include "librpc/gen_ndr/ndr_spoolss_c.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "source3/rpc_client/rpc_client.h"

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 4864535ebd1ac91a6e9afc2bd73fe79955702a3c..3c2effcfa824656145912a4b9fd5bf8cebe986f2 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -35,7 +35,8 @@
 #include "dbwrap/dbwrap_open.h"
 #include "dbwrap/dbwrap_rbt.h"
 #include "async_smb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "trans2.h"
 #include "libsmb/nmblib.h"

diff --git a/source3/torture/utable.c b/source3/torture/utable.c
index 059cae9edd19aa64d5bd26d14c49f6587cb19f5e..87905a642ee429cd4dcd53fc7247625e6691cfa2 100644 (file)
--- a/source3/torture/utable.c
+++ b/source3/torture/utable.c
@@ -21,7 +21,6 @@
 #include "system/filesys.h"
 #include "torture/proto.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "lib/util/string_wrappers.h"
 

diff --git a/source3/utils/clirap2.c b/source3/utils/clirap2.c
index dff54985e26bb5ac336caafe0357a6ef6c1672dd..61f46980fff5f01ab5c4aa6ca89ef01ef2fa1661 100644 (file)
--- a/source3/utils/clirap2.c
+++ b/source3/utils/clirap2.c
@@ -76,7 +76,8 @@
 /*****************************************************/
 
 #include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../librpc/gen_ndr/rap.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "clirap2.h"

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 6c3ebae2e75d2c3fcf71edf30e39789b79c1bc05..b39f0d2739ae210f201d8b563d69f402cb070bc0 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -36,7 +36,8 @@
 #include "smb_krb5.h"
 #include "secrets.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "lib/param/loadparm.h"
 #include "utils/net_dns.h"
 #include "auth/kerberos/pac_utils.h"

diff --git a/source3/utils/net_dom.c b/source3/utils/net_dom.c
index 4342990eaa1aeaefa5c25a865d3ba4557a08afcf..4469b646c0c556089ec01412c69f30cae88ab8c3 100644 (file)
--- a/source3/utils/net_dom.c
+++ b/source3/utils/net_dom.c
@@ -23,7 +23,8 @@
 #include "../librpc/gen_ndr/ndr_winreg.h"
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_net.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 
 int net_dom_usage(struct net_context *c, int argc, const char **argv)
 {

diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index 31e33840aa24948ddef03421ff2b595a5952816b..3f62affe746e37b2005bf473f44028b7bbf1eadb 100644 (file)
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -26,7 +26,8 @@
 #include "../librpc/gen_ndr/rap.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "utils/net.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "clirap2.h"
 #include "../libcli/smb/smbXcli_base.h"
 

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index e2bf574f250137dfb62d4ce7a028845c796690e6..20aa01da90f27e5b5f3f2c4254a0f366e7ab2f5e 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -42,7 +42,8 @@
 #include "libnet/libnet_join.h"
 #include "rpc_client/init_lsa.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "clirap2.h"
 #include "nsswitch/libwbclient/wbclient.h"
 #include "passdb.h"

diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 5434c5628f5e048757e29e255047c3947b04c5bf..ea6faa331b14274e713f50458855a35a3bf2cbca 100644 (file)
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -27,7 +27,8 @@
 #include "registry.h"
 #include "../libcli/security/security.h"
 #include "../libcli/registry/util_reg.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "auth/gensec/gensec.h"

diff --git a/source3/utils/net_rpc_shell.c b/source3/utils/net_rpc_shell.c
index 4e872d8b58b8bbbc46ac94ba2b7c35896d40087b..f50233146b9a80bcd04980851e6d084bf80ae724 100644 (file)
--- a/source3/utils/net_rpc_shell.c
+++ b/source3/utils/net_rpc_shell.c
@@ -25,7 +25,8 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_net.h"
 #include "../libcli/smbreadline/smbreadline.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libcli/security/dom_sid.h"
 
 #include <popt.h>

diff --git a/source3/utils/net_rpc_trust.c b/source3/utils/net_rpc_trust.c
index 5f89689068a8ffec1fad807169ba963dbdaf3a00..ef10bb4c078d7a5a7a444f7dda43422e214b30d7 100644 (file)
--- a/source3/utils/net_rpc_trust.c
+++ b/source3/utils/net_rpc_trust.c
@@ -24,7 +24,8 @@
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "../libcli/security/dom_sid.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 
 #include "lib/crypto/gnutls_helpers.h"
 #include <gnutls/gnutls.h>

diff --git a/source3/utils/net_time.c b/source3/utils/net_time.c
index 5923c78cd29708889f266744bb975f7fa69297db..a8fa824ba30d048dbb377688439103c4f10b212d 100644 (file)
--- a/source3/utils/net_time.c
+++ b/source3/utils/net_time.c
@@ -20,7 +20,8 @@
 #include "utils/net.h"
 #include "libsmb/nmblib.h"
 #include "libsmb/namequery.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "../libcli/smb/smbXcli_base.h"
 
 /*

diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index f4f60ab71d4a5083930f638c3d07852e519c7a1c..eb6457073d810f3eb9f5f32cf74686e689d61133 100644 (file)
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -28,7 +28,8 @@
 #include "../librpc/gen_ndr/ndr_dssetup_c.h"
 #include "secrets.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/smbsock_connect.h"
 #include "lib/param/param.h"
 #include "auth/gensec/gensec.h"

diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c
index 6b99acca595806ae12b0826df705f8bc45d14241..78b3eec22f3c655ee85f3ba8b2c9c7d3bdf70dbb 100644 (file)
--- a/source3/utils/netlookup.c
+++ b/source3/utils/netlookup.c
@@ -24,7 +24,8 @@
 #include "rpc_client/cli_pipe.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 
 /********************************************************
  Connection cachine struct. Goes away when ctx destroyed.

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 430ee0b5974c452c0a27b711716f3f88917e2a97..9044eb3cee34d8133b3aa9b77525bebb1e0d37a5 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -28,7 +28,8 @@
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clirap.h"
 #include "passdb/machine_sid.h"
 #include "../librpc/gen_ndr/ndr_lsa_c.h"

diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index 4d0b8f43ae7e1037d8f7739e9b1adbfa549ca467..b9bbb0f01853724d26a67bc321d3a7140e8da313 100644 (file)
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -28,7 +28,8 @@
 #include "rpc_client/cli_lsarpc.h"
 #include "fake_file.h"
 #include "../libcli/security/security.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "lib/param/param.h"
 
 static char *server;

diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index 80dfa0a5944b7df9ca61741f15994c8d07d16052..26363fd58ed97d1ae3bd6915f8de9fa32cc63385 100644 (file)
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -23,7 +23,6 @@
 #include "lib/cmdline/cmdline.h"
 #include "rpc_client/cli_pipe.h"
 #include "../librpc/gen_ndr/ndr_srvsvc_c.h"
-#include "libsmb/libsmb.h"
 #include "libsmb/namequery.h"
 #include "libsmb/clirap.h"
 #include "../libcli/smb/smbXcli_base.h"

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 9231a818407bfeffefa2af8a8702fd8ea81bc806..d4a7312dbd447305f093ba237f7774ce20d583df 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -70,7 +70,8 @@
 #include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/ndr_dssetup_c.h"
 #include "libads/sitename_cache.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
 #include "libsmb/clidgram.h"
 #include "ads.h"
 #include "secrets.h"