s3-includes: finally only include client.h when libsmb is used.

Guenther

diff --git a/source3/client/client_proto.h b/source3/client/client_proto.h
index fa3ca40d6b7137c09212188d38220c18ad2856d7..d119014abdc79372232fa6ff47fa2269513b5a0b 100644 (file)
--- a/source3/client/client_proto.h
+++ b/source3/client/client_proto.h
@@ -23,6 +23,8 @@
 #ifndef _CLIENT_PROTO_H_
 #define _CLIENT_PROTO_H_
 
+struct cli_state;
+struct file_info;
 
 /* The following definitions come from client/client.c  */
 

diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h
index d2303cc7036a2d1c3d9ed88b4c2ddb8ad74cad4d..a8852b2eea4c98c285f74b8a1b91300639f5eec7 100644 (file)
--- a/source3/include/async_smb.h
+++ b/source3/include/async_smb.h
@@ -20,7 +20,7 @@
 #ifndef __ASYNC_SMB_H__
 #define __ASYNC_SMB_H__
 
-#include "includes.h"
+struct cli_state;
 
 /*
  * Fetch an error out of a NBT packet

diff --git a/source3/include/includes.h b/source3/include/includes.h
index ddac6d02d1540fe8ffdee7cb8b60cd434df07d80..5e8b21235d29ef2c38d4857b5058a43a014e3b26 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -530,8 +530,6 @@ typedef char fstring[FSTRING_LEN];
 #include "smb.h"
 #include "../lib/util/byteorder.h"
 
-#include "client.h"
-
 #include "module.h"
 #include "../lib/util/talloc_stack.h"
 #include "../lib/util/smb_threads.h"

diff --git a/source3/include/proto.h b/source3/include/proto.h
index c7d08276657a3f23fac8b88a15cc286e617ab1cc..e0bdabc7804cf057ae8194178cbb47b8773a847c 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1695,6 +1695,7 @@ const char *lp_printcapname(void);
 bool lp_disable_spoolss( void );
 void lp_set_spoolss_state( uint32 state );
 uint32 lp_get_spoolss_state( void );
+struct smb_signing_state;
 bool lp_use_sendfile(int snum, struct smb_signing_state *signing_state);
 void set_use_sendfile(int snum, bool val);
 void set_store_dos_attributes(int snum, bool val);

diff --git a/source3/libsmb/clirap.h b/source3/libsmb/clirap.h
index 6ea6978c045b16e015884933d260cf202adae250..26265dec50c7511a2344a27fe718eedcc3b3d0b3 100644 (file)
--- a/source3/libsmb/clirap.h
+++ b/source3/libsmb/clirap.h
@@ -25,6 +25,8 @@
 #ifndef _LIBSMB_CLIRAP_H
 #define _LIBSMB_CLIRAP_H
 
+struct cli_state;
+
 /* The following definitions come from libsmb/clirap.c  */
 
 bool cli_api(struct cli_state *cli,

diff --git a/source3/libsmb/libsmb.h b/source3/libsmb/libsmb.h
index 210e55ebaa451d8a1fe07720ecbe6ad34a6e2b85..7a9fb633b8032e7b4f21eb45f7cb83871906f5cc 100644 (file)
--- a/source3/libsmb/libsmb.h
+++ b/source3/libsmb/libsmb.h
@@ -18,6 +18,7 @@
 #ifndef _LIBSMB_LIBSMB_H
 #define _LIBSMB_LIBSMB_H
 
+#include "client.h"
 #include "libsmb/proto.h"
 
 #endif /* _LIBSMB_LIBSMB_H */

diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c
index 0dd2b4e6a6e37ccf6f9767050532488fe36d26d6..df2dbade1d4ba122bce632f030620d76a3492fce 100644 (file)
--- a/source3/libsmb/smbsock_connect.c
+++ b/source3/libsmb/smbsock_connect.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "../lib/util/tevent_ntstatus.h"
+#include "client.h"
 #include "async_smb.h"
 #include "libsmb/nmblib.h"
 

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 24db5dcba6a09def7fd2dbbc1f90ee0833ed863c..dcdf1f5a24445a4282cdbd904bec2b5ac4968fb5 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -33,6 +33,7 @@
 #include "librpc/crypto/spnego.h"
 #include "rpc_dce.h"
 #include "cli_pipe.h"
+#include "client.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_CLI

diff --git a/source3/rpc_client/cli_pipe_schannel.c b/source3/rpc_client/cli_pipe_schannel.c
index 0535e930be70c5b5bcc2086096c5c34d99486acc..b7ef39f8e6d337ff6c011afdbe988e4dee7c2d29 100644 (file)
--- a/source3/rpc_client/cli_pipe_schannel.c
+++ b/source3/rpc_client/cli_pipe_schannel.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/rpc/dcerpc.h"
 #include "passdb.h"
+#include "client.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_CLI

diff --git a/source3/torture/proto.h b/source3/torture/proto.h
index e40e44c114d4fd37a20be5afce59f25466e900fc..ebaf6cf1ebfbee834324cfefa03dc146692b5041 100644 (file)
--- a/source3/torture/proto.h
+++ b/source3/torture/proto.h
@@ -23,6 +23,8 @@
 #ifndef __TORTURE_H__
 #define __TORTURE_H__
 
+struct cli_state;
+
 /* The following definitions come from torture/denytest.c  */
 
 bool torture_denytest1(int dummy);

diff --git a/source3/utils/net.h b/source3/utils/net.h
index ac43068c12fddd9d9e0e84e8a45d5a908e6621cc..1d1559f12d247f6d964a3fa20095462d51938f0a 100644 (file)
--- a/source3/utils/net.h
+++ b/source3/utils/net.h
@@ -22,6 +22,8 @@
  * include
  */
 
+struct cli_state;
+
 #include "../librpc/gen_ndr/lsa.h"
 
 #include "intl.h"

diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 31f4e3ec5fd2018f87d2b12c981071dc5987c210..20a6bdaa249ee3167fb34c39745e19dc0bcd5637 100644 (file)
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -31,6 +31,7 @@
 #include <assert.h>
 #include "../libcli/security/display_sec.h"
 #include "../libcli/registry/util_reg.h"
+#include "client.h"
 
 
 /*******************************************************************