r12499: Move smb_build.h out of includes.h

(This used to be commit c92ace494f92084ddf178626cdf392d151043bc7)

diff --git a/source4/auth/auth.c b/source4/auth/auth.c
index c1295f5cf1d62c8fddd4d6940e8d09bd4ca6648a..dd524e8ca2eaca4057d6454a876bedc6ba78f728 100644 (file)
--- a/source4/auth/auth.c
+++ b/source4/auth/auth.c
@@ -23,6 +23,7 @@
 #include "dlinklist.h"
 #include "auth/auth.h"
 #include "lib/events/events.h"
+#include "smb_build.h"
 
 /***************************************************************************
  Set a fixed challenge

diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c
index 65e22c1467e7561da81d5fc5036ca4076b1f6abd..aaac3ef78cb5353d95f5897a85572e63a40840bf 100644 (file)
--- a/source4/auth/gensec/gensec.c
+++ b/source4/auth/gensec/gensec.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "lib/events/events.h"
+#include "smb_build.h"
 
 /* the list of currently registered GENSEC backends */
 const static struct gensec_security_ops **generic_security_ops;

diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 0d9b1bab1de785bc25641037f8293df98f1dc0a3..674f094c02836c53dfee350657d3fd9fa503b50f 100644 (file)
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -9,7 +9,4 @@
  - list not automatically generated
  - utility function for 'init mutex'
 - install shared modules
-- call load_modules() from subsystems/libraries/binaries with modules
-- remove smb_build.h include from includes.h and INIT_OBJ_FILES. Replace 
-  with individual include/smb_build.h includes
 - improve (un)install scripts (rewrite in perl?)

diff --git a/source4/client/client.c b/source4/client/client.c
index 6cad6a9d39c07e7e87a04f99fab35706906de662..76d44b6920b0063a408c366c2ceba401f31742e4 100644 (file)
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -34,6 +34,7 @@
 #include "dlinklist.h"
 #include "system/readline.h"
 #include "pstring.h"
+#include "smb_build.h"
 
 static struct smbcli_state *cli;
 static int port = 0;

diff --git a/source4/gtk/tools/gepdump.c b/source4/gtk/tools/gepdump.c
index 1f8d156865ba86bb6145f6b1df339e1bcd436f60..41d523b7ceecff44e4e28266a3a0cf7a94e60e44 100644 (file)
--- a/source4/gtk/tools/gepdump.c
+++ b/source4/gtk/tools/gepdump.c
@@ -25,6 +25,7 @@
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
 #include "lib/cmdline/popt_common.h"
+#include "smb_build.h"
 
 /* 
  * Show: 
@@ -459,7 +460,7 @@ static GtkWidget* create_mainwindow (void)
 }
 
 
- int main(int argc, char **argv)
+int main(int argc, char **argv)
 {
        gepdump_init_subsystems;
        lp_load();

diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c
index 57a30c091ee20559a503fc28cff11402c65063dd..94cfb4123e5d33f768784a8203da0fc581133ba1 100644 (file)
--- a/source4/gtk/tools/gregedit.c
+++ b/source4/gtk/tools/gregedit.c
@@ -24,6 +24,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
+#include "smb_build.h"
 
 static GtkTreeStore *store_keys;
 static GtkListStore *store_vals;

diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c
index a98fe412db7cccdd8e204127a3b141f718bbdf87..647fdd2c1655d30f58e19350a3c6053c4dc702ba 100644 (file)
--- a/source4/gtk/tools/gwcrontab.c
+++ b/source4/gtk/tools/gwcrontab.c
@@ -23,6 +23,7 @@
 #include "librpc/gen_ndr/ndr_atsvc.h"
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
+#include "smb_build.h"
 
 static struct dcerpc_pipe *at_pipe = NULL;
 static GtkWidget *mainwin;

diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c
index 78f597500ee353e187ccf0fe1e3d5a430a2881bd..644cc5c0439ad0b948ed02fd5b1942b00878e11a 100644 (file)
--- a/source4/gtk/tools/gwsam.c
+++ b/source4/gtk/tools/gwsam.c
@@ -23,6 +23,7 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
+#include "smb_build.h"
 
 struct policy_handle sam_handle;
 struct dcerpc_pipe *sam_pipe = NULL;

diff --git a/source4/include/includes.h b/source4/include/includes.h
index fdd155b0eee95d2608e81ce92e83d86e7ae51841..2222b4ff430ec3fa0065e10ab8ee264329927784 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -113,10 +113,6 @@ struct ipv4_addr {
 #include "cli_context.h"
 #include "auth/credentials/credentials.h"
 
-#ifndef NO_CONFIG_H
-#include "smb_build.h"
-#endif
-
 /***** automatically generated prototypes *****/
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #include "include/proto.h"

diff --git a/source4/lib/com/main.c b/source4/lib/com/main.c
index f264c3f25b60828e822fc7d3f2c2a4bc46bb1d7d..123ba49b09fb74d958d56d829d48affeb0c734e3 100644 (file)
--- a/source4/lib/com/main.c
+++ b/source4/lib/com/main.c
@@ -23,6 +23,7 @@
 #include "lib/com/com.h"
 #include "lib/events/events.h"
 #include "librpc/gen_ndr/com_dcom.h"
+#include "smb_build.h"
 
 WERROR com_init_ctx(struct com_context **ctx, struct event_context *event_ctx)
 {

diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index 78dc84d01cf3f7e5e69e13cfd5972c0d36c652d7..3bbc87d05f67795b49d19801163b1bf2a7247928 100644 (file)
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -28,6 +28,7 @@
 #include "ldb/tools/cmdline.h"
 #ifdef _SAMBA_BUILD_
 #include "lib/cmdline/popt_common.h"
+#include "smb_build.h"
 #endif
 
 /*

diff --git a/source4/lib/registry/common/reg_interface.c b/source4/lib/registry/common/reg_interface.c
index ac8b90dcdbed80b0be5373fd27677122b3538a8b..b0540c1ba424efe183d1e53e06f89277dbd94feb 100644 (file)
--- a/source4/lib/registry/common/reg_interface.c
+++ b/source4/lib/registry/common/reg_interface.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "dlinklist.h"
 #include "lib/registry/registry.h"
+#include "smb_build.h"
 
 /* List of available backends */
 static struct reg_init_function_entry *backends = NULL;

diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c
index 92fe53ff67b754094162acc2727293cc7741382b..7c6a5d75aeaaf0eda981d0212de6efc48d61642e 100644 (file)
--- a/source4/lib/registry/tools/regdiff.c
+++ b/source4/lib/registry/tools/regdiff.c
@@ -23,6 +23,7 @@
 #include "dynconfig.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
+#include "smb_build.h"
 
 int main(int argc, char **argv)
 {

diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index eca14741a599211d4361e84f7751bdb9e91d8f6b..8f86d8a8f008c1bf06245641ac6dc2003faf4c04 100644 (file)
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -25,6 +25,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "system/filesys.h"
 #include "librpc/gen_ndr/winreg.h"
+#include "smb_build.h"
 
 int main(int argc, char **argv)
 {

diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index cd67f09c33f72bb9b13ea4fccb4671b2b15e11ab..ef5c598989b6cc9b43369513aadb39f663ba6b32 100644 (file)
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -25,6 +25,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "system/time.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "smb_build.h"
 
 /* 
  * ck/cd - change key

diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index c24e66412f4ddb9c7b22970b99a51e310d54d16a..8856c4d61c549ddc4567207803d9d6749760407c 100644 (file)
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -23,6 +23,7 @@
 #include "dynconfig.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
+#include "smb_build.h"
 
 static void print_tree(int l, struct registry_key *p, int fullpath, int novals)
 {

diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c
index 9f07ae597bb2e1f01130f241353835fe4b7b2d1c..b78efd0585189d5ddf36d5d62c6d5a1eee85c4db 100644 (file)
--- a/source4/ntptr/ntptr_base.c
+++ b/source4/ntptr/ntptr_base.c
@@ -26,6 +26,7 @@
 #include "includes.h"
 #include "ntptr/ntptr.h"
 #include "dlinklist.h"
+#include "smb_build.h"
 
 /* the list of currently registered NTPTR backends */
 static struct ntptr_backend {

diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c
index 9cb8293cbc3697a94c5328cf702fce3708245451..1b021527de6f60abf5704e002c5e1f56196a6743 100644 (file)
--- a/source4/ntvfs/ntvfs_base.c
+++ b/source4/ntvfs/ntvfs_base.c
@@ -26,8 +26,7 @@
 #include "includes.h"
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"
-
-
+#include "smb_build.h"
 
 /* the list of currently registered NTVFS backends, note that there
  * can be more than one backend with the same name, as long as they

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 276779ef19175a6651b2203fa79b095a02cc5303..a8724b5bb83c2f1e8dff840e0ad21f1c9a7aba33 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -31,6 +31,7 @@
 #include "lib/events/events.h"
 #include "smbd/service_stream.h"
 #include "system/filesys.h"
+#include "smb_build.h"
 
 /*
   see if two endpoints match

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index e0123eee878f0c6e8175359ebbd68a1c15c26133..0e131e0ba53a241e20bd1f8113afe2011873e7b9 100644 (file)
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -25,6 +25,7 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
+#include "smb_build.h"
 
 static EjsId eid;
 

diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index 312cc5e264a915ea0d4aa5b2512fc2323b1345e1..f98468265714f7258d704fc59f3e1f69c7a2dffc 100644 (file)
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "smb_server/smb_server.h"
+#include "smb_build.h"
 
 /*
   setup the events for the chosen process model

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 838cb627d73c174743b22c4aada8cd7903584b11..52221b096b0456ea9236c8cd0ede77e16becd71a 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -30,6 +30,7 @@
 #include "system/dir.h"
 #include "system/filesys.h"
 #include "system/kerberos.h"
+#include "smb_build.h"
 
 /*
   recursively delete a directory tree

diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 711cd202926603ae760f0625c5f0e146cf35754b..9f2bb64b60ce005332802af668911537d6d3a6d0 100644 (file)
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -24,6 +24,7 @@
 #include "request.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "smb_build.h"
 
 #define NSERVERS 2
 #define NINSTANCES 2

diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index be363d0cb3942cd4eefc686a94bdab9c9bd82322..f302240fa28698c8bbce2a3e4b651f25e9b016c7 100644 (file)
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -22,6 +22,7 @@
 #include "system/filesys.h"
 #include "system/time.h"
 #include "pstring.h"
+#include "smb_build.h"
 
 static int numops = 1000;
 static BOOL showall;

diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 0b1c58a2f257e8596b450f9972f180a769052434..db54a157e143924ca0d76c10837a06916199c18a 100644 (file)
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -24,6 +24,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "pstring.h"
+#include "smb_build.h"
 
 static struct cli_credentials *credentials;
 static BOOL showall = False;

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 220b99f7cab7b8b72f563c95d071cf81a5ed94b5..412db115b7a8f766cdf0709a5eae225ea545e266 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -27,6 +27,7 @@
 #include "system/filesys.h"
 #include "ioctl.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "smb_build.h"
 
 int torture_nprocs=4;
 int torture_numops=10;

diff --git a/source4/utils/ndrdump.c b/source4/utils/ndrdump.c
index 9036d5340903fcc4bd9f067a028e177c0a75172b..611283ee694c7d9093db98c9a2ad5c25685aa5dd 100644 (file)
--- a/source4/utils/ndrdump.c
+++ b/source4/utils/ndrdump.c
@@ -22,6 +22,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "system/iconv.h"
 #include "system/filesys.h"
+#include "smb_build.h"
 
 static const struct dcerpc_interface_call *find_function(
        const struct dcerpc_interface_table *p,

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 132b3a1c03b4bd35ccc09fe5b63e04ffeb3518d0..17b12b7103d316a8cb1725710947c1602bafa3b4 100644 (file)
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -44,6 +44,7 @@
 #include "includes.h"
 #include "utils/net/net.h"
 #include "lib/cmdline/popt_common.h"
+#include "smb_build.h"
 
 /*
   run a function from a function table. If not found then

diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index 10e8110debfa47d7e21f305e91f24ea5e36d59c5..22fd377dca90e50c62daa67ceb14477b24b98a67 100644 (file)
--- a/source4/utils/ntlm_auth.c
+++ b/source4/utils/ntlm_auth.c
@@ -29,6 +29,7 @@
 #include "auth/auth.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "pstring.h"
+#include "smb_build.h"
 
 #define SQUID_BUFFER_SIZE 2010