lib: give global_contexts.c its own header file

It's a bit shocking how many references we have to global
contexts. Make this a bit more obvious.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index e8bb9d7821a280f6ac07712c80bbf70a116de859..fa73c4e4db28f776fc972694c614b239322a5f1a 100644 (file)
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -23,6 +23,7 @@
 
 #include "param/param.h"
 #include "../lib/messaging/messaging.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source3/auth/auth_samba4.c b/source3/auth/auth_samba4.c
index 6dee9c6f411645f74ce733af54f469609ffa0860..0a7c67be2323cefe4a2481aa6838c193eadd3a1f 100644 (file)
--- a/source3/auth/auth_samba4.c
+++ b/source3/auth/auth_samba4.c
@@ -28,6 +28,7 @@
 #include "source4/lib/messaging/messaging.h"
 #include "auth/gensec/gensec.h"
 #include "auth/credentials/credentials.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6e14ac42777bf5cbf9b47120002ba77970c37fb9..2f25778ab9f6ebde165fbbf8503d2c0f82beb775 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -708,12 +708,6 @@ NTSTATUS trust_pw_change(struct netlogon_creds_cli_context *context,
                         const char *dcname,
                         bool force);
 
-/* The following definitions come from lib/server_contexts.c  */
-struct tevent_context *global_event_context(void);
-void global_event_context_free(void);
-struct messaging_context *global_messaging_context(void);
-void global_messaging_context_free(void);
-
 /* The following definitions come from lib/sessionid_tdb.c  */
 struct sessionid;
 NTSTATUS sessionid_traverse_read(int (*fn)(const char *key,

diff --git a/source3/lib/cmdline_contexts.c b/source3/lib/cmdline_contexts.c
index 2bee7f38059b74ccdde408fc1d4c1cd1d2506905..627ee4f3164607b43ca641dc193bf0c6c177feaa 100644 (file)
--- a/source3/lib/cmdline_contexts.c
+++ b/source3/lib/cmdline_contexts.c
@@ -21,6 +21,7 @@
 #include "cmdline_contexts.h"
 #include "includes.h"
 #include "messages.h"
+#include "lib/global_contexts.h"
 
 struct messaging_context *cmdline_messaging_context(const char *config_file)
 {

diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index e67341607a40905e5fdcd7fe66b905aa71c4bbf5..1d8c40af75e65ce78b39949893e4bcf45ed14e27 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -29,7 +29,7 @@
 #include "lib/messages_ctdb.h"
 #include "util_tdb.h"
 #include "ctdbd_conn.h"
-#include "messages.h"
+#include "global_contexts.h"
 
 bool db_is_local(const char *name)
 {

diff --git a/source3/lib/global_contexts.c b/source3/lib/global_contexts.c
index 03ab8e4fd4833daeb6ea6e2474349a7c541391b4..4e3bbabfffe86745d7e27cb77b32a48e502f4a1b 100644 (file)
--- a/source3/lib/global_contexts.c
+++ b/source3/lib/global_contexts.c
@@ -18,7 +18,12 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+
+#include "replace.h"
+#include "global_contexts.h"
+#include <tevent.h>
+#include "lib/util/fault.h"
+#include "lib/util/samba_util.h"
 #include "messages.h"
 
 static struct tevent_context *global_event_ctx = NULL;

diff --git a/source3/lib/global_contexts.h b/source3/lib/global_contexts.h
new file mode 100644 (file)
index 0000000..8c5cd09
--- /dev/null
+++ b/source3/lib/global_contexts.h
@@ -0,0 +1,31 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Global contexts
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GLOBAL_CONTEXTS_H__
+#define __GLOBAL_CONTEXTS_H__
+
+struct tevent_context;
+
+struct tevent_context *global_event_context(void);
+void global_event_context_free(void);
+
+struct messaging_context;
+struct messaging_context *global_messaging_context(void);
+void global_messaging_context_free(void);
+
+#endif

diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index 64b90db3227f623d130be2bd55db3158918300f6..80c04fdeda07c947f48d7447a2518c14e0739118 100644 (file)
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -56,6 +56,7 @@
 #include "lib/util/tevent_ntstatus.h"
 #include "g_lock.h"
 #include "smbd/fd_handle.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING

diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index 772906fb7716e98646e76de6b878a7a32fd1bf30..87dcbdd6270e2b60ea620e4382a0d357aaec30f4 100644 (file)
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -30,6 +30,7 @@
 #include "lib/util/sys_rw_data.h"
 #include "lib/util/msghdr.h"
 #include "smbprofile.h"
+#include "lib/global_contexts.h"
 
 #if !defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) && !defined(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS)
 # error Can not pass file descriptors

diff --git a/source3/modules/vfs_delay_inject.c b/source3/modules/vfs_delay_inject.c
index d70c0f0cb6a4673e36269070fc3dafde5051faa6..7d65387af1dbdba3a80f180ade589ca67583cf48 100644 (file)
--- a/source3/modules/vfs_delay_inject.c
+++ b/source3/modules/vfs_delay_inject.c
@@ -21,6 +21,7 @@
 #include "locking/share_mode_lock.h"
 #include "smbd/smbd.h"
 #include "lib/util/tevent_unix.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS

diff --git a/source3/modules/vfs_preopen.c b/source3/modules/vfs_preopen.c
index d27c4a8200066b9525f69e696af10be32d69e2f3..1549fda0b5e703dbbba1d0126a61380392349388 100644 (file)
--- a/source3/modules/vfs_preopen.c
+++ b/source3/modules/vfs_preopen.c
@@ -24,6 +24,7 @@
 #include "lib/util/sys_rw.h"
 #include "lib/util/sys_rw_data.h"
 #include "lib/util/smb_strtox.h"
+#include "lib/global_contexts.h"
 
 struct preopen_state;
 

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index f6aeba1f7142a97be0dab30c87338debb0e45b9c..ab1bb88892cb301bd02f6a99b4832450670d287b 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -28,6 +28,7 @@
 #include "../lib/util/pidfile.h"
 #include "util_cluster.h"
 #include "lib/gencache.h"
+#include "lib/global_contexts.h"
 
 int ClientNMB       = -1;
 int ClientDGRAM     = -1;

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index cdfa4903916e77fd759afe998840f85d887d9844..3c4499a4459dd7136987c428a8980751864f5c2e 100644 (file)
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -38,6 +38,7 @@
 #include "lib/util_sid_passdb.h"
 #include "idmap_cache.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 26b1dfd98b3d6165498791acd84b8ca1a45df9ad..47f6beba1c4c37cd43f217a8ce2c8b6b3e67ee02 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -35,6 +35,7 @@
 #include "rpc_server/spoolss/srv_spoolss_nt.h"
 #include "rpc_client/cli_winreg_spoolss.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/global_contexts.h"
 
 /* Map generic permissions to printer object specific permissions */
 

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 2798f629bcbf93cfa02d78c84178d706a32c9c47..70a891b89bee2cf40fdbc9d0cfc54ccf6b91bf4e 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -38,6 +38,7 @@
 #include "lib/param/loadparm.h"
 #include "lib/util/sys_rw_data.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/global_contexts.h"
 
 extern userdom_struct current_user_info;
 

diff --git a/source3/printing/queue_process.c b/source3/printing/queue_process.c
index 7b14cd94568001a71ba0d4896fcceaddf0cc1557..b4f167956dcaadffb3650bb78d15d2514cd75b16 100644 (file)
--- a/source3/printing/queue_process.c
+++ b/source3/printing/queue_process.c
@@ -37,6 +37,7 @@
 #include "auth.h"
 #include "nt_printing.h"
 #include "util_event.h"
+#include "lib/global_contexts.h"
 
 /**
  * @brief Purge stale printers and reload from pre-populated pcap cache.

diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index cd1f4b2188a5caa9a1a1f09c36f969667d18737b..e539ac121c282a8b993055ea18c853ac8e87e5ad 100644 (file)
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -39,6 +39,7 @@
 #include "librpc/rpc/dcesrv_core.h"
 #include "lib/server_prefork.h"
 #include "lib/server_prefork_util.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/eventlog/srv_eventlog_nt.c b/source3/rpc_server/eventlog/srv_eventlog_nt.c
index 7739d1953ef2d4d1c0236a27f1bf0397b0facf56..23e5babd9a2d517bd4d7d658ffc6a3c7298d5b36 100644 (file)
--- a/source3/rpc_server/eventlog/srv_eventlog_nt.c
+++ b/source3/rpc_server/eventlog/srv_eventlog_nt.c
@@ -36,6 +36,7 @@
 #include "librpc/rpc/dcesrv_core.h"
 #include "librpc/gen_ndr/ndr_eventlog_scompat.h"
 #include "rpc_server/eventlog/srv_eventlog_reg.h"
+#include "lib/global_contexts.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/fss/srv_fss_agent.c b/source3/rpc_server/fss/srv_fss_agent.c
index 0cc3a5d0fbb37afb27b2b0a1155b3c16c9724140..0f25bf17188bd757db2eafe0be42d507aa93ae65 100644 (file)
--- a/source3/rpc_server/fss/srv_fss_agent.c
+++ b/source3/rpc_server/fss/srv_fss_agent.c
@@ -32,6 +32,7 @@
 #include "librpc/gen_ndr/ndr_fsrvp.h"
 #include "rpc_server/rpc_server.h"
 #include "srv_fss_private.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/lsasd.c b/source3/rpc_server/lsasd.c
index 2c1fc2db5d05f50d91c571862a41e24a098efb2b..1fa9233c38f2513c25d7840d65533a152393ac6a 100644 (file)
--- a/source3/rpc_server/lsasd.c
+++ b/source3/rpc_server/lsasd.c
@@ -42,6 +42,7 @@
 #include "librpc/gen_ndr/ndr_lsa_scompat.h"
 #include "librpc/gen_ndr/ndr_samr_scompat.h"
 #include "librpc/gen_ndr/ndr_netlogon_scompat.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/mdssd.c b/source3/rpc_server/mdssd.c
index d4ef815cd6c68cff604d90ea1f3d2b23fd591f5b..22e4f0914454fdb1b0694da160ef3a3c5a69e88e 100644 (file)
--- a/source3/rpc_server/mdssd.c
+++ b/source3/rpc_server/mdssd.c
@@ -39,6 +39,7 @@
 
 #include "rpc_server/mdssvc/srv_mdssvc_nt.h"
 #include "rpc_server/mdssd.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/mdssvc/mdssvc.c b/source3/rpc_server/mdssvc/mdssvc.c
index 8e98276d6428e5a451f6b433719937c749e2b9e9..0df29dc9b1e8ebcc811e7e09fa5303698d69afc4 100644 (file)
--- a/source3/rpc_server/mdssvc/mdssvc.c
+++ b/source3/rpc_server/mdssvc/mdssvc.c
@@ -34,6 +34,7 @@
 #ifdef HAVE_SPOTLIGHT_BACKEND_ES
 #include "mdssvc_es.h"
 #endif
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/mdssvc/srv_mdssvc_nt.c b/source3/rpc_server/mdssvc/srv_mdssvc_nt.c
index b96072622163a044eaf3544350191feb70b172d3..56ebe68c7e91fffc9c6f55680f6b44aca3a40a89 100644 (file)
--- a/source3/rpc_server/mdssvc/srv_mdssvc_nt.c
+++ b/source3/rpc_server/mdssvc/srv_mdssvc_nt.c
@@ -34,6 +34,7 @@
 #include "librpc/rpc/dcesrv_core.h"
 #include "librpc/gen_ndr/ndr_mdssvc.h"
 #include "librpc/gen_ndr/ndr_mdssvc_scompat.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/rpc_config.c b/source3/rpc_server/rpc_config.c
index 310b6a50eeba0c2e0b1247a5a3c51822643c9e01..2f1a01da1c0befe5b7ff5b0361fe1dacf54c7aaf 100644 (file)
--- a/source3/rpc_server/rpc_config.c
+++ b/source3/rpc_server/rpc_config.c
@@ -23,6 +23,7 @@
 #include "rpc_server/rpc_server.h"
 #include "lib/param/param.h"
 #include "librpc/rpc/dcesrv_core.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index 77cb18b6a88f1b5a1a639ff84e97cc1bbde10a34..28000677fc83c8a586e2e2789400ee488dd5a2f6 100644 (file)
--- a/source3/rpc_server/samr/srv_samr_nt.c
+++ b/source3/rpc_server/samr/srv_samr_nt.c
@@ -52,6 +52,7 @@
 #include "lib/crypto/gnutls_helpers.h"
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 840e0280a7309902cd9dcfb66750d04fa5427bc7..d20c19d5271b850f04a00cfc1d9a62729ceb804f 100644 (file)
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -64,6 +64,7 @@
 #include "librpc/rpc/dcesrv_core.h"
 #include "printing/nt_printing_migrate_internal.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/global_contexts.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 67477d7b4169dd8695a5d78fafbf7e0eeb2c925a..474c0397ae6d56f2dab8f7e0644f2df7d70ffafc 100644 (file)
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -41,6 +41,7 @@
 #include "auth.h"
 #include "messages.h"
 #include "serverid.h"
+#include "lib/global_contexts.h"
 
 extern const struct generic_mapping file_generic_mapping;
 

diff --git a/source3/rpc_server/svcctl/srv_svcctl_nt.c b/source3/rpc_server/svcctl/srv_svcctl_nt.c
index c67688346ebc510c2f8b97903b8fb4236e77b35c..0a11af2ba149ccf30c30fee9ecd9093aa0e75e71 100644 (file)
--- a/source3/rpc_server/svcctl/srv_svcctl_nt.c
+++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c
@@ -37,6 +37,7 @@
 #include "librpc/gen_ndr/ndr_svcctl.h"
 #include "librpc/gen_ndr/ndr_svcctl_scompat.h"
 #include "srv_svcctl_reg.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index b5c1ccdb846aa50c67a0b559d69d748fc62a668e..7b5ea2515019f81bae865c0d3102bcf75be7e7df 100644 (file)
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -33,6 +33,7 @@
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_dfsblobs.h"
 #include "lib/tsocket/tsocket.h"
+#include "lib/global_contexts.h"
 
 /**********************************************************************
  Parse a DFS pathname of the form \hostname\service\reqpath

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index ea2d08c13a066d20dac7f814a528afebaad33c5e..a0456100afe1aee3bea88b5f0f0001cddddd488c 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -58,6 +58,7 @@
 #include "rpc_server/lsasd.h"
 #include "rpc_server/fssd.h"
 #include "rpc_server/mdssd.h"
+#include "lib/global_contexts.h"
 
 #ifdef CLUSTER_SUPPORT
 #include "ctdb_protocol.h"

diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index aa5ebe5fcd42d0d5253fdda27aa9d1fc69532cef..a00edcd2368e4dfd7a869fc12b660d535014d89f 100644 (file)
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -38,6 +38,7 @@
 #include "libcli/auth/netlogon_creds_cli.h"
 #include "lib/gencache.h"
 #include "rpc_server/rpc_config.h"
+#include "lib/global_contexts.h"
 
 static struct files_struct *log_writeable_file_fn(
        struct files_struct *fsp, void *private_data)

diff --git a/source3/smbd/smbXsrv_session.c b/source3/smbd/smbXsrv_session.c
index c55a57885a576243c025e91d61c3c9d7c4618ddc..05cf4a095eeed48f48e8a857b4767b160682b08d 100644 (file)
--- a/source3/smbd/smbXsrv_session.c
+++ b/source3/smbd/smbXsrv_session.c
@@ -38,6 +38,7 @@
 #include "librpc/gen_ndr/ndr_smbXsrv.h"
 #include "serverid.h"
 #include "lib/util/tevent_ntstatus.h"
+#include "lib/global_contexts.h"
 
 struct smbXsrv_session_table {
        struct {

diff --git a/source3/torture/test_dbwrap_ctdb.c b/source3/torture/test_dbwrap_ctdb.c
index 15db2daccd6b51d16df4c55bd0002e0e9c9061f9..e3a7c6a0035bd92d1d94c9b9af89157e67ee77f7 100644 (file)
--- a/source3/torture/test_dbwrap_ctdb.c
+++ b/source3/torture/test_dbwrap_ctdb.c
@@ -24,6 +24,7 @@
 #include "lib/dbwrap/dbwrap_ctdb.h"
 #include "messages.h"
 #include "lib/messages_ctdb.h"
+#include "lib/global_contexts.h"
 
 bool run_local_dbwrap_ctdb1(int dummy)
 {

diff --git a/source3/torture/test_dbwrap_do_locked.c b/source3/torture/test_dbwrap_do_locked.c
index 7226ec1412875bff384f0c006f28fd73eaf28886..93648ced79f114807f0838f50455050ab4affea8 100644 (file)
--- a/source3/torture/test_dbwrap_do_locked.c
+++ b/source3/torture/test_dbwrap_do_locked.c
@@ -25,6 +25,7 @@
 #include "lib/dbwrap/dbwrap_watch.h"
 #include "lib/util/util_tdb.h"
 #include "source3/include/util_tdb.h"
+#include "lib/global_contexts.h"
 
 struct do_locked1_state {
        TDB_DATA value;

diff --git a/source3/torture/test_g_lock.c b/source3/torture/test_g_lock.c
index 2f98a1a227521f4729e9d2f8093db4e0b4ad5ce3..002e390af19052381ae836748132f668f205daee 100644 (file)
--- a/source3/torture/test_g_lock.c
+++ b/source3/torture/test_g_lock.c
@@ -26,6 +26,7 @@
 #include "lib/util/sys_rw.h"
 #include "lib/util/util_tdb.h"
 #include "lib/util/tevent_ntstatus.h"
+#include "lib/global_contexts.h"
 
 static bool get_g_lock_ctx(TALLOC_CTX *mem_ctx,
                           struct tevent_context **ev,

diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index b89596e487c7bda6c8f0dc97967fb9614f699fc1..e4b6760853f6945bec1308a44b7e12e04ef54ea9 100644 (file)
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -36,6 +36,7 @@
 #include "libcli/security/security.h"
 #include "lib/smbd_shim.h"
 #include "system/filesys.h"
+#include "lib/global_contexts.h"
 
 /* List to hold groups of commands */
 static struct cmd_list {

diff --git a/source3/utils/net_vfs.c b/source3/utils/net_vfs.c
index ce145de1e50bed7578fad4b23ca67339885dad6d..5b8e1fc4e048292f63f167aae3b717abdc3cef49 100644 (file)
--- a/source3/utils/net_vfs.c
+++ b/source3/utils/net_vfs.c
@@ -36,6 +36,7 @@
 #include "lib/adouble.h"
 #include "lib/string_replace.h"
 #include "utils/net.h"
+#include "lib/global_contexts.h"
 
 #define NET_VFS_CMD_STREAM_TO_ADOUBLE "stream2adouble"
 

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index e5a6e986d82676ef979f9cdebe4e596841d2b643..57c029b7e536bc79ae8fa39a59494f001ce9dd64 100644 (file)
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -37,6 +37,7 @@
 #include "serverid.h"
 #include "cmdline_contexts.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/global_contexts.h"
 
 #ifdef HAVE_LIBUNWIND_H
 #include <libunwind.h>

diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index 2f879bf77e86a052fa3d6a535965bcefedde7f7b..36ab94b766741957e3a4798dacd04d1cfd9552e9 100644 (file)
--- a/source3/winbindd/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
@@ -30,6 +30,7 @@
 #include "idmap_rw.h"
 #include "../libcli/security/security.h"
 #include "lib/util/smb_strtox.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/idmap_rfc2307.c b/source3/winbindd/idmap_rfc2307.c
index a747ff1f3bf73c4d455a5c44094c71861678746d..05259bf8344b39afc584043eba64824c36cbecdd 100644 (file)
--- a/source3/winbindd/idmap_rfc2307.c
+++ b/source3/winbindd/idmap_rfc2307.c
@@ -31,6 +31,7 @@
 #include "nsswitch/winbind_client.h"
 #include "lib/winbind_util.h"
 #include "libcli/security/dom_sid.h"
+#include "lib/global_contexts.h"
 
 /*
  * Config and connection info per domain.

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 1e08237905a811f9726e0238ca2b68289730bf96..bff5b9a72829b3db4ccf704b9625f69fe6665966 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -50,6 +50,7 @@
 #include "lib/util/tevent_req_profile.h"
 #include "lib/gencache.h"
 #include "rpc_server/rpc_config.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 4c1ccb479ff02e26b69c0b342898d9d4b4e564cd..2029e4e8315aaa1dd460387d53db8a231bec1b12 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -86,6 +86,7 @@
 #include "lib/param/param.h"
 #include "lib/gencache.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_cred_cache.c b/source3/winbindd/winbindd_cred_cache.c
index 52aa0ff6aea1473f4f60c67064d2c8e4304434e7..c3077e219893d62785ef8c4bdeb44772fc9619a6 100644 (file)
--- a/source3/winbindd/winbindd_cred_cache.c
+++ b/source3/winbindd/winbindd_cred_cache.c
@@ -26,6 +26,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "smb_krb5.h"
 #include "libads/kerberos_proto.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_domain_info.c b/source3/winbindd/winbindd_domain_info.c
index 5376a86704e4d42e038bc3b010629a1c75401e27..a9319849729e35a08a7756b8084f1e25c336c146 100644 (file)
--- a/source3/winbindd/winbindd_domain_info.c
+++ b/source3/winbindd/winbindd_domain_info.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/global_contexts.h"
 
 struct winbindd_domain_info_state {
        struct winbindd_domain *domain;

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index c489913766595075c44d169aa00db67975ad1dfd..a93a987df076f4d15da9d31fd50fdaca7bcae4fc 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -42,6 +42,7 @@
 #include "lib/util/sys_rw_data.h"
 #include "passdb.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c
index 40a30d70ff94e0e79266c46b4605e873be0e7a0a..ffd7bb957b25f7418dea5d548feb637f7d7d4ba8 100644 (file)
--- a/source3/winbindd/winbindd_dual_srv.c
+++ b/source3/winbindd/winbindd_dual_srv.c
@@ -37,6 +37,7 @@
 #include "rpc_client/cli_netlogon.h"
 #include "rpc_client/util_netlogon.h"
 #include "libsmb/dsgetdcname.h"
+#include "lib/global_contexts.h"
 
 void _wbint_Ping(struct pipes_struct *p, struct wbint_Ping *r)
 {

diff --git a/source3/winbindd/winbindd_gpupdate.c b/source3/winbindd/winbindd_gpupdate.c
index 293ca375564760bf1c6b651ba3c867251c1fe134..1032251d401169088c95d48ecd4b9fe4500a3058 100644 (file)
--- a/source3/winbindd/winbindd_gpupdate.c
+++ b/source3/winbindd/winbindd_gpupdate.c
@@ -20,6 +20,7 @@
 #include "param/param.h"
 #include "param/loadparm.h"
 #include "winbindd.h"
+#include "lib/global_contexts.h"
 
 /*
  * gpupdate_interval()

diff --git a/source3/winbindd/winbindd_idmap.c b/source3/winbindd/winbindd_idmap.c
index 3e2461478a9f5f337c15b2604ee14f63edd72c88..41be6f144796ef20d73b3fd74ff9cfd496eae709 100644 (file)
--- a/source3/winbindd/winbindd_idmap.c
+++ b/source3/winbindd/winbindd_idmap.c
@@ -25,6 +25,7 @@
 #include "winbindd.h"
 #include "../libcli/security/security.h"
 #include "passdb/lookup_sid.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_irpc.c b/source3/winbindd/winbindd_irpc.c
index fda29c7e7022a9e1da6da750b0b5f65806cb46c4..e419736010b800f67bb24ffb1f815f481f75069e 100644 (file)
--- a/source3/winbindd/winbindd_irpc.c
+++ b/source3/winbindd/winbindd_irpc.c
@@ -31,6 +31,7 @@
 #include "passdb/lookup_sid.h" /* only for LOOKUP_NAME_NO_NSS flag */
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "lib/global_contexts.h"
 
 struct wb_irpc_forward_state {
        struct irpc_message *msg;

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index bc11247e581ab75378d020733bca377b8b46bd55..10c5ff2a7e25e1d015947f36d4c3b2005b680835 100644 (file)
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -51,6 +51,7 @@
 
 #include "lib/crypto/gnutls_helpers.h"
 #include <gnutls/crypto.h>
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_pam_auth.c b/source3/winbindd/winbindd_pam_auth.c
index 6ad546a6e89df4c1a7c5d1e4568c1f37013d4ad4..9c6558ae8056f46a8f31d90d4eeecaf21ce7a920 100644 (file)
--- a/source3/winbindd/winbindd_pam_auth.c
+++ b/source3/winbindd/winbindd_pam_auth.c
@@ -21,6 +21,7 @@
 #include "winbindd.h"
 #include "libcli/security/dom_sid.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/global_contexts.h"
 
 struct winbindd_pam_auth_state {
        struct winbindd_request *request;

diff --git a/source3/winbindd/winbindd_pam_auth_crap.c b/source3/winbindd/winbindd_pam_auth_crap.c
index e172ef8b52672cdbd8420a920e5fc84d21ee480c..dacb6566be67356eddbab8b5be659202d0c5ae89 100644 (file)
--- a/source3/winbindd/winbindd_pam_auth_crap.c
+++ b/source3/winbindd/winbindd_pam_auth_crap.c
@@ -22,6 +22,7 @@
 #include "rpc_client/util_netlogon.h"
 #include "libcli/security/dom_sid.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/global_contexts.h"
 
 struct winbindd_pam_auth_crap_state {
        struct winbindd_response *response;

diff --git a/source3/winbindd/winbindd_pam_chauthtok.c b/source3/winbindd/winbindd_pam_chauthtok.c
index 3a61ba30f4c17cae62e001ec7d6324f94f2b60b4..e476d53f0306f4b47e4ff30e26d43b7133f9e15e 100644 (file)
--- a/source3/winbindd/winbindd_pam_chauthtok.c
+++ b/source3/winbindd/winbindd_pam_chauthtok.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/global_contexts.h"
 
 struct winbindd_pam_chauthtok_state {
        struct winbindd_request *request;

diff --git a/source3/winbindd/winbindd_pam_chng_pswd_auth_crap.c b/source3/winbindd/winbindd_pam_chng_pswd_auth_crap.c
index 38d84be0af705ad0930d8112e1f3b299f8beb0d8..4c39ce0b5aca91391f54ea80f109f7bde01a8a54 100644 (file)
--- a/source3/winbindd/winbindd_pam_chng_pswd_auth_crap.c
+++ b/source3/winbindd/winbindd_pam_chng_pswd_auth_crap.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "lib/global_contexts.h"
 
 struct winbindd_pam_chng_pswd_auth_crap_state {
        struct winbindd_request *request;

diff --git a/source3/winbindd/winbindd_pam_logoff.c b/source3/winbindd/winbindd_pam_logoff.c
index 30f69e1004507ba7d0262e27b2e5e54fd0eef235..553b1e5833b33d36e463d1470a5d6bdcf159615c 100644 (file)
--- a/source3/winbindd/winbindd_pam_logoff.c
+++ b/source3/winbindd/winbindd_pam_logoff.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "lib/global_contexts.h"
 
 struct winbindd_pam_logoff_state {
        struct winbindd_request *request;

diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 4b595d03417b2dca8e32bb4378e21e0e4e8625f6..a5f5defcd8728e713eaf47dd2d75ed0b25bcfa17 100644 (file)
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -35,6 +35,7 @@
 #include "libsmb/samlogon_cache.h"
 #include "lib/util/smb_strtox.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/global_contexts.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND