s3-build: only include async headers where needed.

Guenther

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 2e45b7964d8a2c189bfbec7936b4736c12d2c684..7e3c381731fbeed0069b2a4780dce1cf3aaaf126 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -656,8 +656,6 @@ extern void *cmdline_lp_ctx;
 #include "ctdbd_conn.h"
 #include "../lib/util/talloc_stack.h"
 #include "serverid.h"
-#include "async_smb.h"
-#include "../lib/async_req/async_sock.h"
 #include "../lib/util/smb_threads.h"
 #include "../lib/util/smb_threads_internal.h"
 

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 46926f629878fad23d7865dee2463920bf76edbf..2b338162934227e8d2b69f38a80a1d7c08a72750 100644 (file)
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "memcache.h"
+#include "../lib/async_req/async_sock.h"
 
 /****************************************************************************
  Get a port number in host byte order from a sockaddr_storage.

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 8e08d6fc406556ff2c47ac4b3c3fafdd0307a429..0aaeea28270ce01b8948def37a8fc55549daf895 100644 (file)
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -18,6 +18,8 @@
 */
 
 #include "includes.h"
+#include "../lib/async_req/async_sock.h"
+#include "async_smb.h"
 
 /*
  * Read an smb packet asynchronously, discard keepalives

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index ebfc98b179539c74682b1a56be7ad7fbeec2944c..92e5bb2021d5a267fd949bd0af7328aebe509dee 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -26,6 +26,7 @@
 #include "../libcli/auth/ntlmssp.h"
 #include "libads/kerberos_proto.h"
 #include "krb5_env.h"
+#include "async_smb.h"
 
 static const struct {
        int prot;

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index cdf51c75c37942de02486d3426b4124eba158623..2c49a8b3f0e8771751a4aef16fc9d387d57139a6 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "smb_signing.h"
+#include "async_smb.h"
 
 /*******************************************************************
  Setup the word count and byte count for a client smb message.

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index d6b2e31de70db7d9b172357ea0d9ca3f8a2b0ca2..ce8d7a593bfd59ffa249ed825fe05d2f2c5dffc5 100644 (file)
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "async_smb.h"
 
 /***********************************************************
  Common function for pushing stings, used by smb_bytes_push_str()

diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 6cbf7104d4ecd50d9e21a751cdd9ce3de1d1dbfb..5ca76ac16a8410c09b6997695524c6e331e4cb10 100644 (file)
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "../libcli/auth/spnego.h"
 #include "../libcli/auth/ntlmssp.h"
+#include "async_smb.h"
 
 /****************************************************************************
  Get UNIX extensions version info.

diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index b580172317a0a82a0becacdd014cb52c9a897d40..280f876ba74f90d2d0ce670b633f14a1bd99adff 100644 (file)
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "async_smb.h"
 
 /****************************************************************************
  Calculate a safe next_entry_offset.

diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c
index 3777c41482200982bf70aab1c4224061364c6eba..4c730c4b76e9127e1a13e504c0f45edaa40f38a9 100644 (file)
--- a/source3/libsmb/climessage.c
+++ b/source3/libsmb/climessage.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "async_smb.h"
 
 struct cli_message_start_state {
        uint16_t grp;

diff --git a/source3/libsmb/clioplock.c b/source3/libsmb/clioplock.c
index 8904ac973fdfcb75236f85dfdd8ce61422f4b83f..09f9869420a849379e2d493065b6b00d48a9fe0d 100644 (file)
--- a/source3/libsmb/clioplock.c
+++ b/source3/libsmb/clioplock.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "async_smb.h"
 
 /****************************************************************************
 send an ack for an oplock break request

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index a1b911cfbf3d5724425da30b74020b1d6849d660..3ac9f4454fb6662ab1b081d60b834be0205e9dc5 100644 (file)
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -23,6 +23,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/rap.h"
 #include "../lib/crypto/arcfour.h"
+#include "async_smb.h"
 
 /****************************************************************************
  Call a remote api

diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 24c9d9f681f0727785e0a493f2c3d7c4b3ad604e..370c068fe4519de8be011fda8c31ca29c84f56fe 100644 (file)
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "async_smb.h"
 
 /****************************************************************************
   Calculate the recommended read buffer size

diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index dd0873d8249cf0ff92b0b5f31b1d0cf868a8cb92..4379e1480a8dda766e17f621fe5af28b85df5940 100644 (file)
--- a/source3/libsmb/clitrans.c
+++ b/source3/libsmb/clitrans.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-
+#include "async_smb.h"
 
 /****************************************************************************
  Send a SMB trans or trans2 request.

diff --git a/source3/rpc_client/rpc_transport_sock.c b/source3/rpc_client/rpc_transport_sock.c
index b7bb7d70d5ab2a9f6df8cda0b34d36460a44245f..359ec478cca78661f9255997c0f4d26713efdb47 100644 (file)
--- a/source3/rpc_client/rpc_transport_sock.c
+++ b/source3/rpc_client/rpc_transport_sock.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "../lib/async_req/async_sock.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_CLI

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 40009c8a3c738dc48d61f5b09e5307d5a7bf0035..434f52889b7245df84282b27ccf1caea30845900 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -22,6 +22,7 @@
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "../lib/async_req/async_sock.h"
 
 extern bool global_machine_password_needs_changing;
 

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 06ed264debc63e4d21e7a17b768ffc6e17447130..d19c9838664c2e2c0585ff46608a224e11b9ff96 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -29,6 +29,7 @@
 #include "nsswitch/winbind_client.h"
 #include "dbwrap.h"
 #include "talloc_dict.h"
+#include "async_smb.h"
 
 extern char *optarg;
 extern int optind;