From 71e6b33aa67599fa70806f8dd8db6de80acb4cb5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Fri, 6 May 2011 12:53:38 +0200 Subject: [PATCH] s3-includes: finally only include client.h when libsmb is used. Guenther (cherry picked from commit 675573d54b717ffc24cf3b49301ff649aecc259a) (cherry picked from commit 58cae168b5f29afda9dc7132f2770c3f58a89772) --- source3/client/client_proto.h | 2 ++ source3/include/async_smb.h | 2 +- source3/include/includes.h | 2 -- source3/include/proto.h | 1 + source3/libsmb/clirap.h | 2 ++ source3/libsmb/libsmb.h | 1 + source3/libsmb/smbsock_connect.c | 1 + source3/rpc_client/cli_pipe.c | 1 + source3/rpc_client/cli_pipe_schannel.c | 1 + source3/torture/proto.h | 2 ++ source3/utils/net.h | 2 ++ source3/utils/net_rpc_registry.c | 1 + 12 files changed, 15 insertions(+), 3 deletions(-) diff --git a/source3/client/client_proto.h b/source3/client/client_proto.h index fa3ca40d6b7..d119014abdc 100644 --- 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 d2303cc7036..a8852b2eea4 100644 --- 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 432e475ad2f..48b8bf4c27d 100644 --- 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 ca395b62d31..d25764bc059 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1801,6 +1801,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 6ea6978c045..26265dec50c 100644 --- 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 210e55ebaa4..7a9fb633b80 100644 --- 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 6bd54eb298b..88b4533bad2 100644 --- 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 17f8f013a70..ec58b3d646c 100644 --- 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 0535e930be7..b7ef39f8e6d 100644 --- 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 f27a253f2de..fc46eddd299 100644 --- 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 ac43068c12f..1d1559f12d2 100644 --- 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 31f4e3ec5fd..20a6bdaa249 100644 --- a/source3/utils/net_rpc_registry.c +++ b/source3/utils/net_rpc_registry.c @@ -31,6 +31,7 @@ #include #include "../libcli/security/display_sec.h" #include "../libcli/registry/util_reg.h" +#include "client.h" /******************************************************************* -- 2.11.4.GIT