From e9f5bdf6b5a1aeb7e2e556cf41f7cbc2abed7856 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 18 May 2010 02:27:34 +0200 Subject: smbconf: only include smbconf headers where needed. Guenther --- source3/include/includes.h | 5 ----- source3/lib/netapi/serverinfo.c | 2 ++ source3/lib/smbconf/smbconf_init.c | 1 + source3/lib/smbconf/smbconf_reg.c | 2 ++ source3/lib/smbconf/testsuite.c | 4 ++++ source3/libnet/libnet_join.c | 2 ++ source3/param/loadparm.c | 3 +++ source3/utils/net_conf.c | 3 +++ 8 files changed, 17 insertions(+), 5 deletions(-) (limited to 'source3') diff --git a/source3/include/includes.h b/source3/include/includes.h index 20a52e6e5d..3e48d16805 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -679,11 +679,6 @@ struct ntlmssp_state; #include "../lib/util/smb_threads.h" #include "../lib/util/smb_threads_internal.h" -#include "lib/smbconf/smbconf.h" -#include "lib/smbconf/smbconf_init.h" -#include "lib/smbconf/smbconf_reg.h" -#include "lib/smbconf/smbconf_txt.h" - #include "nsswitch/winbind_nss.h" /* forward declaration from printing.h to get around diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c index 51932a5a92..edf41686c5 100644 --- a/source3/lib/netapi/serverinfo.c +++ b/source3/lib/netapi/serverinfo.c @@ -24,6 +24,8 @@ #include "lib/netapi/netapi_private.h" #include "lib/netapi/libnetapi.h" #include "../librpc/gen_ndr/cli_srvsvc.h" +#include "lib/smbconf/smbconf.h" +#include "lib/smbconf/smbconf_reg.h" /**************************************************************** ****************************************************************/ diff --git a/source3/lib/smbconf/smbconf_init.c b/source3/lib/smbconf/smbconf_init.c index 58bb9d9362..36c51de5f0 100644 --- a/source3/lib/smbconf/smbconf_init.c +++ b/source3/lib/smbconf/smbconf_init.c @@ -21,6 +21,7 @@ #include "lib/smbconf/smbconf_private.h" #include "lib/smbconf/smbconf_txt.h" #include "lib/smbconf/smbconf_reg.h" +#include "lib/smbconf/smbconf_init.h" /** * smbconf initialization dispatcher diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c index 96b5f1ee24..6c500785a0 100644 --- a/source3/lib/smbconf/smbconf_reg.c +++ b/source3/lib/smbconf/smbconf_reg.c @@ -20,6 +20,8 @@ #include "includes.h" #include "lib/smbconf/smbconf_private.h" #include "registry.h" +#include "lib/smbconf/smbconf_init.h" +#include "lib/smbconf/smbconf_reg.h" #define INCLUDES_VALNAME "includes" diff --git a/source3/lib/smbconf/testsuite.c b/source3/lib/smbconf/testsuite.c index c83eeb805d..42ef76df11 100644 --- a/source3/lib/smbconf/testsuite.c +++ b/source3/lib/smbconf/testsuite.c @@ -18,6 +18,10 @@ */ #include "includes.h" +#include "lib/smbconf/smbconf.h" +#include "lib/smbconf/smbconf_init.h" +#include "lib/smbconf/smbconf_reg.h" +#include "lib/smbconf/smbconf_txt.h" static void print_strings(const char *prefix, uint32_t num_strings, const char **strings) diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 5271c910dd..7d19c63d75 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -24,6 +24,8 @@ #include "../librpc/gen_ndr/cli_samr.h" #include "../librpc/gen_ndr/cli_lsa.h" #include "../librpc/gen_ndr/cli_netlogon.h" +#include "lib/smbconf/smbconf.h" +#include "lib/smbconf/smbconf_reg.h" /**************************************************************** ****************************************************************/ diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 113b8677a1..8a762d70e9 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -53,6 +53,9 @@ #include "includes.h" #include "printing.h" +#include "lib/smbconf/smbconf.h" +#include "lib/smbconf/smbconf_init.h" +#include "lib/smbconf/smbconf_reg.h" #ifdef HAVE_SYS_SYSCTL_H #include diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c index 6fc03bfd86..58e8cadf94 100644 --- a/source3/utils/net_conf.c +++ b/source3/utils/net_conf.c @@ -29,6 +29,9 @@ #include "includes.h" #include "utils/net.h" +#include "lib/smbconf/smbconf.h" +#include "lib/smbconf/smbconf_init.h" +#include "lib/smbconf/smbconf_reg.h" /********************************************************************** * -- cgit