s3-tsocket: only include ../lib/tsocket/tsocket.h where needed.

Guenther

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 014d1d44bd2eb562ad600e2f0138bf808e70e828..6c1e0b4d4e06a80c317877d62eb0da8fbd830bd6 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -522,7 +522,6 @@ typedef char fstring[FSTRING_LEN];
 #include "event.h"
 #include "../lib/util/tevent_unix.h"
 #include "../lib/util/tevent_ntstatus.h"
-#include "../lib/tsocket/tsocket.h"
 
 #include "../lib/util/data_blob.h"
 #include "../lib/util/time.h"

diff --git a/source3/include/proto.h b/source3/include/proto.h
index c9552d75542975a257f28c1f4251158ed2374f60..b4a910917e41f23f076d6c0a31ad47a0a59e185b 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -925,6 +925,7 @@ struct tevent_req *getaddrinfo_send(TALLOC_CTX *mem_ctx,
 int getaddrinfo_recv(struct tevent_req *req, struct addrinfo **res);
 int poll_one_fd(int fd, int events, int timeout, int *revents);
 int poll_intr_one_fd(int fd, int events, int timeout, int *revents);
+struct tstream_context;
 struct tevent_req *tstream_read_packet_send(TALLOC_CTX *mem_ctx,
                                            struct tevent_context *ev,
                                            struct tstream_context *stream,

diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index cd1dea52ba5f6ac1f9fca6766a621d6c1041aefd..b5be3a8e24a82a57ed896c951349d86b8e096949 100644 (file)
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "tldap.h"
 #include "../lib/util/asn1.h"
+#include "../lib/tsocket/tsocket.h"
 
 static int tldap_simple_recv(struct tevent_req *req);
 

diff --git a/source3/lib/util_tsock.c b/source3/lib/util_tsock.c
index 1cb88c67bd03ab515f03c3919522e786498d36f6..dce209286802dddef16d1e217ffbb0320206e686 100644 (file)
--- a/source3/lib/util_tsock.c
+++ b/source3/lib/util_tsock.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "../lib/tsocket/tsocket.h"
 
 struct tstream_read_packet_state {
        struct tevent_context *ev;

diff --git a/source3/rpc_client/rpc_transport_sock.c b/source3/rpc_client/rpc_transport_sock.c
index 71f979c2af99a9a587ecdcc02ae835b6feae2f8f..1dd01325830c5fc2d47b86dc99af8f9838d01a4c 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/tsocket/tsocket.h"
 #include "rpc_client/rpc_transport.h"
 #include "../lib/async_req/async_sock.h"
 

diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
index e89a366f9e91a22047e9cbde07dc904fcc0e7647..bd751788578b4450f129efc54afdc5bc41106534 100644 (file)
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -31,6 +31,7 @@
 #include "../auth/auth_sam_reply.h"
 #include "auth.h"
 #include "ntdomain.h"
+#include "../lib/tsocket/tsocket.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index 5252598726901810d6daf95e5c3f499c5854637e..11689672d6a920260fefe16e8c566dbbd7391712 100644 (file)
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -29,6 +29,7 @@
 #include "rpc_dce.h"
 #include "rpc_server/rpc_ncacn_np.h"
 #include "ntdomain.h"
+#include "../lib/tsocket/tsocket.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 248b3e403d01f70806b6fbfbc1fd543143c00862..10632696c737f215658ec252405b59c705858785 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "../lib/tsocket/tsocket.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index b29713d21d2923a23f45724cb6c6a6015e723ec0..5ab612a20bd5fe58ee67fa76a5c17c18c13cc9a3 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "../lib/tsocket/tsocket.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/netlogon.h"

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 3cf6758e2965b12c7f86af72d3d5034263ad90c8..3631d589f517213797314311d2d972009118b96d 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "../lib/tsocket/tsocket.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"