diff options
29 files changed, 28 insertions, 10 deletions
diff --git a/source4/auth/auth.c b/source4/auth/auth.c index c1295f5cf1..dd524e8ca2 100644 --- 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 65e22c1467..aaac3ef78c 100644 --- 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 0d9b1bab1d..674f094c02 100644 --- 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 6cad6a9d39..76d44b6920 100644 --- 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 1f8d156865..41d523b7ce 100644 --- 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 57a30c091e..94cfb4123e 100644 --- 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 a98fe412db..647fdd2c16 100644 --- 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 78f597500e..644cc5c043 100644 --- 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 fdd155b0ee..2222b4ff43 100644 --- 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 f264c3f25b..123ba49b09 100644 --- 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 78dc84d01c..3bbc87d05f 100644 --- 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 ac8b90dcdb..b0540c1ba4 100644 --- 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 92fe53ff67..7c6a5d75ae 100644 --- 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 eca14741a5..8f86d8a8f0 100644 --- 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 cd67f09c33..ef5c598989 100644 --- 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 c24e66412f..8856c4d61c 100644 --- 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 9f07ae597b..b78efd0585 100644 --- 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 9cb8293cbc..1b021527de 100644 --- 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 276779ef19..a8724b5bb8 100644 --- 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 e0123eee87..0e131e0ba5 100644 --- 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 312cc5e264..f984682657 100644 --- 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 838cb627d7..52221b096b 100644 --- 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 711cd20292..9f2bb64b60 100644 --- 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 be363d0cb3..f302240fa2 100644 --- 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 0b1c58a2f2..db54a157e1 100644 --- 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 220b99f7ca..412db115b7 100644 --- 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 9036d53409..611283ee69 100644 --- 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 132b3a1c03..17b12b7103 100644 --- 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 10e8110deb..22fd377dca 100644 --- 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 |