diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-18 02:27:34 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-18 10:36:33 +0200 |
| commit | e9f5bdf6b5a1aeb7e2e556cf41f7cbc2abed7856 (patch) | |
| tree | 8ed9d55ef0bba9c9accba15902f512c40ab6aa51 | |
| parent | 415bd627642bb8f18f180daaf61c4a6ddb62ebbd (diff) | |
| download | samba-e9f5bdf6b5a1aeb7e2e556cf41f7cbc2abed7856.tar.gz | |
smbconf: only include smbconf headers where needed.
Guenther
| -rw-r--r-- | lib/smbconf/smbconf_txt.c | 1 | ||||
| -rw-r--r-- | source3/include/includes.h | 5 | ||||
| -rw-r--r-- | source3/lib/netapi/serverinfo.c | 2 | ||||
| -rw-r--r-- | source3/lib/smbconf/smbconf_init.c | 1 | ||||
| -rw-r--r-- | source3/lib/smbconf/smbconf_reg.c | 2 | ||||
| -rw-r--r-- | source3/lib/smbconf/testsuite.c | 4 | ||||
| -rw-r--r-- | source3/libnet/libnet_join.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 3 | ||||
| -rw-r--r-- | source3/utils/net_conf.c | 3 |
9 files changed, 18 insertions, 5 deletions
diff --git a/lib/smbconf/smbconf_txt.c b/lib/smbconf/smbconf_txt.c index 501382cc5fd..37b01df3d30 100644 --- a/lib/smbconf/smbconf_txt.c +++ b/lib/smbconf/smbconf_txt.c @@ -27,6 +27,7 @@ #include "includes.h" #include "smbconf_private.h" +#include "lib/smbconf/smbconf_txt.h" struct txt_cache { uint32_t current_share; diff --git a/source3/include/includes.h b/source3/include/includes.h index 20a52e6e5d9..3e48d168054 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 51932a5a920..edf41686c53 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 58bb9d93627..36c51de5f03 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 96b5f1ee24b..6c500785a06 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 c83eeb805de..42ef76df11e 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 5271c910dda..7d19c63d757 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 113b8677a14..8a762d70e90 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 <sys/sysctl.h> diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c index 6fc03bfd86b..58e8cadf94c 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" /********************************************************************** * |