Use a custom init function for samba4 that sets a samba4

specific debug function.
By default do not debug, this is the most appropriate action for a library
as we cannot assume what stderr is use for in the main app.
The main app is responsible to set ev_debug_stderr if they so desire.

diff --git a/source/client/cifsdd.c b/source/client/cifsdd.c
index ce48c7bad1f7f73422b6bbb8038bdf7a6e6e22b4..141b165ad44808e68f61011137720593411afa16 100644 (file)
--- a/source/client/cifsdd.c
+++ b/source/client/cifsdd.c
@@ -581,7 +581,7 @@ int main(int argc, const char ** argv)
                }
        }
 
-       ev = event_context_init(talloc_autofree_context());
+       ev = s4_event_context_init(talloc_autofree_context());
 
        gensec_init(cmdline_lp_ctx);
        dump_args();

diff --git a/source/client/client.c b/source/client/client.c
index 01197e8a9ee8cc2abffaf9ade19a01c00ed5eb18..e05e195372f2ca362d54b7e52321e2caf6a79861 100644 (file)
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -3228,7 +3228,7 @@ static int do_message_op(const char *netbios_name, const char *desthost,
 
        lp_smbcli_options(cmdline_lp_ctx, &smb_options);
 
-       ev_ctx = event_context_init(talloc_autofree_context());
+       ev_ctx = s4_event_context_init(talloc_autofree_context());
 
        DEBUG( 3, ( "Client started (version %s).\n", SAMBA_VERSION_STRING ) );
 

diff --git a/source/cluster/ctdb/ib/ibwrapper_test.c b/source/cluster/ctdb/ib/ibwrapper_test.c
index 07c78e7709eb1da03faf7190b0dc27eeafad50d8..1be37ddd2873bfc062ba7e8047fb80e4b81ead1d 100644 (file)
--- a/source/cluster/ctdb/ib/ibwrapper_test.c
+++ b/source/cluster/ctdb/ib/ibwrapper_test.c
@@ -604,7 +604,7 @@ int main(int argc, char *argv[])
                goto cleanup;
        }
 
-       ev = event_context_init(NULL);
+       ev = s4_event_context_init(NULL);
        assert(ev);
 
        tcx->ibwctx = ibw_init(tcx->attrs, tcx->nattrs,

diff --git a/source/cluster/ctdb/server/ctdb_daemon.c b/source/cluster/ctdb/server/ctdb_daemon.c
index 32aa2ba2724aea3fa7d53066d2cd11f4d4f320bd..f96cd86916bdb7c89f12c35268dca0ba06daddc1 100644 (file)
--- a/source/cluster/ctdb/server/ctdb_daemon.c
+++ b/source/cluster/ctdb/server/ctdb_daemon.c
@@ -650,7 +650,7 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork)
        domain_socket_name = talloc_strdup(talloc_autofree_context(), ctdb->daemon.name);
        talloc_set_destructor(domain_socket_name, unlink_destructor);   
 
-       ctdb->ev = event_context_init(NULL);
+       ctdb->ev = s4_event_context_init(NULL);
 
        /* start frozen, then let the first election sort things out */
        if (!ctdb_blocking_freeze(ctdb)) {

diff --git a/source/cluster/ctdb/server/ctdb_recoverd.c b/source/cluster/ctdb/server/ctdb_recoverd.c
index 5cb985521d7a2781029417c27d08326e80475e80..8ebd357c147e04911e52cdc7c1f5a5f4799c823e 100644 (file)
--- a/source/cluster/ctdb/server/ctdb_recoverd.c
+++ b/source/cluster/ctdb/server/ctdb_recoverd.c
@@ -1487,7 +1487,7 @@ int ctdb_start_recoverd(struct ctdb_context *ctdb)
 
        /* get a new event context */
        talloc_free(ctdb->ev);
-       ctdb->ev = event_context_init(ctdb);
+       ctdb->ev = s4_event_context_init(ctdb);
 
        event_add_fd(ctdb->ev, ctdb, fd[0], EVENT_FD_READ|EVENT_FD_AUTOCLOSE, 
                     ctdb_recoverd_parent, &fd[0]);     

diff --git a/source/cluster/ctdb/server/ctdbd.c b/source/cluster/ctdb/server/ctdbd.c
index 2c4a23b67396aec371caedfcc2e4dfa66ad17966..9729902f507c5cdbe224efe31afc3546f9e43b2f 100644 (file)
--- a/source/cluster/ctdb/server/ctdbd.c
+++ b/source/cluster/ctdb/server/ctdbd.c
@@ -141,7 +141,7 @@ int main(int argc, const char *argv[])
 
        block_signal(SIGPIPE);
 
-       ev = event_context_init(NULL);
+       ev = s4_event_context_init(NULL);
 
        ctdb = ctdb_cmdline_init(ev);
 

diff --git a/source/cluster/ctdb/tests/ctdb_bench.c b/source/cluster/ctdb/tests/ctdb_bench.c
index f1292ee275d9e953f9f3bf2a548ade97988c0594..77b7f15d358b82457ebf4194c4b41c92e53dad70 100644 (file)
--- a/source/cluster/ctdb/tests/ctdb_bench.c
+++ b/source/cluster/ctdb/tests/ctdb_bench.c
@@ -192,7 +192,7 @@ int main(int argc, const char *argv[])
                while (extra_argv[extra_argc]) extra_argc++;
        }
 
-       ev = event_context_init(NULL);
+       ev = s4_event_context_init(NULL);
 
        /* initialise ctdb */
        ctdb = ctdb_cmdline_client(ev);

diff --git a/source/cluster/ctdb/tests/ctdb_fetch.c b/source/cluster/ctdb/tests/ctdb_fetch.c
index f57d05d09931db52391bb41c2b6523390b8d83e4..d5ec645757d273cf0f7582b21063e5dae99ad1da 100644 (file)
--- a/source/cluster/ctdb/tests/ctdb_fetch.c
+++ b/source/cluster/ctdb/tests/ctdb_fetch.c
@@ -211,7 +211,7 @@ int main(int argc, const char *argv[])
                while (extra_argv[extra_argc]) extra_argc++;
        }
 
-       ev = event_context_init(NULL);
+       ev = s4_event_context_init(NULL);
 
        ctdb = ctdb_cmdline_client(ev);
 

diff --git a/source/cluster/ctdb/tests/ctdb_store.c b/source/cluster/ctdb/tests/ctdb_store.c
index a60e009b91076d52f39da5149c21ac64f23f4053..8b44276d21cb4d5f83f5bd8c17d0cb5e49a8f46e 100644 (file)
--- a/source/cluster/ctdb/tests/ctdb_store.c
+++ b/source/cluster/ctdb/tests/ctdb_store.c
@@ -131,7 +131,7 @@ int main(int argc, const char *argv[])
                while (extra_argv[extra_argc]) extra_argc++;
        }
 
-       ev = event_context_init(NULL);
+       ev = s4_event_context_init(NULL);
 
        ctdb = ctdb_cmdline_client(ev);
 

diff --git a/source/cluster/ctdb/tools/ctdb.c b/source/cluster/ctdb/tools/ctdb.c
index 2308261d00535eb0079063ed30bf2a1ac7ee5587..3be42cee5b960e8109546d9e2359a2800905640c 100644 (file)
--- a/source/cluster/ctdb/tools/ctdb.c
+++ b/source/cluster/ctdb/tools/ctdb.c
@@ -977,7 +977,7 @@ int main(int argc, const char *argv[])
 
        control = extra_argv[0];
 
-       ev = event_context_init(NULL);
+       ev = s4_event_context_init(NULL);
 
        /* initialise ctdb */
        ctdb = ctdb_cmdline_client(ev);

diff --git a/source/dsdb/samdb/samdb.c b/source/dsdb/samdb/samdb.c
index 4557b6c9ccb49d989307cfb5080078ad5b97a5ed..acc2c2a9a15925e7171bda134c275fd5eca08a8c 100644 (file)
--- a/source/dsdb/samdb/samdb.c
+++ b/source/dsdb/samdb/samdb.c
@@ -121,7 +121,7 @@ int samdb_copy_template(struct ldb_context *ldb,
                /* FIXME: need to remove this wehn we finally pass the event
                 * context around in ldb */
                if (event_ctx == NULL) {
-                       event_ctx = event_context_init(templates_ldb);
+                       event_ctx = s4_event_context_init(templates_ldb);
                }
 
                templates_ldb = ldb_wrap_connect(ldb, event_ctx, lp_ctx, 

diff --git a/source/lib/events/events.h b/source/lib/events/events.h
index 750cdfee050c9ceee89e6057dd072531a2bc9dd5..478f127a3527352e69c84066925025499cc19a7e 100644 (file)
--- a/source/lib/events/events.h
+++ b/source/lib/events/events.h
@@ -43,7 +43,6 @@ typedef void (*event_aio_handler_t)(struct event_context *, struct aio_event *,
                                    int, void *);
 
 #ifdef _SAMBA_BUILD_
-struct event_context *s4_event_context_init_byname(TALLOC_CTX *mem_ctx, const char *name);
 struct event_context *s4_event_context_init(TALLOC_CTX *mem_ctx);
 #endif
 

diff --git a/source/lib/events/events_debug.c b/source/lib/events/events_debug.c
index 70b85d47e406a34a14b58512bdb58dc1f52e0a17..233844f02466a23170219d32f227adfb284024ed 100644 (file)
--- a/source/lib/events/events_debug.c
+++ b/source/lib/events/events_debug.c
@@ -43,9 +43,9 @@ int ev_set_debug(struct event_context *ev,
 /*
   debug function for ev_set_debug_stderr
 */
-static void ev_debug_stderr(void *context, enum ev_debug_level level,
+void ev_debug_stderr(void *context, enum ev_debug_level level,
                            const char *fmt, va_list ap) PRINTF_ATTRIBUTE(3,0);
-static void ev_debug_stderr(void *context, enum ev_debug_level level,
+void ev_debug_stderr(void *context, enum ev_debug_level level,
                            const char *fmt, va_list ap)
 {
        if (level <= EV_DEBUG_WARNING) {
@@ -63,13 +63,18 @@ int ev_set_debug_stderr(struct event_context *ev)
 }
 
 /*
-  log a message
+ * log a message
+ *
+ * The default debug action is to ignore debugging messages.
+ * This is the most appropriate action for a library.
+ * Applications using the library must decide where to
+ * redirect debugging messages
 */
 void ev_debug(struct event_context *ev, enum ev_debug_level level, const char *fmt, ...)
 {
        va_list ap;
        if (ev->debug_ops.debug == NULL) {
-               ev_set_debug_stderr(ev);
+               return;
        }
        va_start(ap, fmt);
        ev->debug_ops.debug(ev->debug_ops.context, level, fmt, ap);

diff --git a/source/lib/events/events_s4.c b/source/lib/events/events_s4.c
index edf92dba223855dcb31d58dc0756a947d1452207..134f899cf8983822cfdc5fbaa25e8706d79f39f6 100644 (file)
--- a/source/lib/events/events_s4.c
+++ b/source/lib/events/events_s4.c
@@ -55,3 +55,54 @@ NTSTATUS s4_events_aio_init(void)
        return NT_STATUS_OK;
 }
 #endif
+
+/*
+  this is used to catch debug messages from events
+*/
+static void ev_wrap_debug(void *context, enum ev_debug_level level,
+                         const char *fmt, va_list ap)  PRINTF_ATTRIBUTE(3,0);
+
+static void ev_wrap_debug(void *context, enum ev_debug_level level,
+                         const char *fmt, va_list ap)
+{
+       int samba_level = -1;
+       char *s = NULL;
+       switch (level) {
+       case EV_DEBUG_FATAL:
+               samba_level = 0;
+               break;
+       case EV_DEBUG_ERROR:
+               samba_level = 1;
+               break;
+       case EV_DEBUG_WARNING:
+               samba_level = 2;
+               break;
+       case EV_DEBUG_TRACE:
+               samba_level = 5;
+               break;
+
+       };
+       vasprintf(&s, fmt, ap);
+       if (!s) return;
+       DEBUG(samba_level, ("events: %s\n", s));
+       free(s);
+}
+
+/*
+  create a event_context structure. This must be the first events
+  call, and all subsequent calls pass this event_context as the first
+  element. Event handlers also receive this as their first argument.
+
+  This samba4 specific call sets the samba4 debug handler.
+*/
+struct event_context *s4_event_context_init(TALLOC_CTX *mem_ctx)
+{
+       struct event_context *ev;
+
+       ev = event_context_init_byname(mem_ctx, NULL);
+       if (ev) {
+               ev_set_debug(ev, ev_wrap_debug, NULL);
+       }
+       return ev;
+}
+

diff --git a/source/lib/ldb/ldb_ildap/ldb_ildap.c b/source/lib/ldb/ldb_ildap/ldb_ildap.c
index 6b50b2f5eba73a050f243d6d745c078a66a7cfb1..478df3662dfe75edbf493f71ece301bd82e1bd38 100644 (file)
--- a/source/lib/ldb/ldb_ildap/ldb_ildap.c
+++ b/source/lib/ldb/ldb_ildap/ldb_ildap.c
@@ -758,12 +758,12 @@ static int ildb_connect(struct ldb_context *ldb, const char *url,
        module->private_data    = ildb;
        ildb->module            = module;
 
-       event_ctx = ldb_get_opaque(ldb, "EventContext");
+       event_ctx = ldb_get_event_context(ldb);
 
        /* FIXME: We must make the event context an explicit parameter, but we
         * need to build the events library separately first. Hack a new event
-        * context so that CMD line utilities work until we have libevents for
-        * standalone builds ready */
+        * context so that CMD line utilities work until we have them all
+        * converted */
        if (event_ctx == NULL) {
                event_ctx = event_context_init(NULL);
        }

diff --git a/source/lib/messaging/pymessaging.c b/source/lib/messaging/pymessaging.c
index 41c9c82b1f3076b4b4272a04858f0286fd18db2e..621a2fe3494232beda544036ee3a55d8c183fc08 100644 (file)
--- a/source/lib/messaging/pymessaging.c
+++ b/source/lib/messaging/pymessaging.c
@@ -76,7 +76,7 @@ PyObject *py_messaging_connect(PyTypeObject *self, PyObject *args, PyObject *kwa
 
        ret->mem_ctx = talloc_new(NULL);
 
-       ev = event_context_init(ret->mem_ctx);
+       ev = s4_event_context_init(ret->mem_ctx);
 
        if (messaging_path == NULL) {
                messaging_path = lp_messaging_path(ret, global_loadparm);
@@ -330,7 +330,7 @@ PyObject *py_irpc_connect(PyTypeObject *self, PyObject *args, PyObject *kwargs)
 
        ret->server_name = server;
 
-       ev = event_context_init(ret->mem_ctx);
+       ev = s4_event_context_init(ret->mem_ctx);
 
        if (messaging_path == NULL) {
                messaging_path = lp_messaging_path(ret, global_loadparm);

diff --git a/source/lib/registry/registry_wrap.c b/source/lib/registry/registry_wrap.c
index e939e4101d03a7ad17ebf56490e575119b92c797..3fc34b1fe304682c690bbebf66943a96cf9a3c05 100644 (file)
--- a/source/lib/registry/registry_wrap.c
+++ b/source/lib/registry/registry_wrap.c
@@ -3486,7 +3486,7 @@ SWIGINTERN PyObject *_wrap_hive_key(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   
   arg3 = NULL;
   arg4 = NULL;
-  arg5 = event_context_init(NULL);
+  arg5 = s4_event_context_init(NULL);
   arg6 = loadparm_init(NULL);
   arg1 = NULL;
   arg7 = &tmp7;
@@ -3574,7 +3574,7 @@ SWIGINTERN PyObject *_wrap_open_ldb(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   
   arg3 = NULL;
   arg4 = NULL;
-  arg5 = event_context_init(NULL);
+  arg5 = s4_event_context_init(NULL);
   arg6 = loadparm_init(NULL);
   arg1 = NULL;
   arg7 = &tmp7;
@@ -3735,7 +3735,7 @@ SWIGINTERN PyObject *_wrap_open_samba(PyObject *SWIGUNUSEDPARM(self), PyObject *
     (char *) "ev_ctx",(char *) "lp_ctx",(char *) "session_info",(char *) "credentials", NULL 
   };
   
-  arg3 = event_context_init(NULL);
+  arg3 = s4_event_context_init(NULL);
   arg4 = loadparm_init(NULL);
   arg5 = NULL;
   arg6 = NULL;

diff --git a/source/lib/registry/tools/regdiff.c b/source/lib/registry/tools/regdiff.c
index 9b49799bed90f7b7003cd492d8711d868c61ea75..240c582340aab95ec390ea6f13cba4b6ab040726 100644 (file)
--- a/source/lib/registry/tools/regdiff.c
+++ b/source/lib/registry/tools/regdiff.c
@@ -118,7 +118,7 @@ int main(int argc, const char **argv)
 
        }
 
-       ev_ctx = event_context_init(NULL);
+       ev_ctx = s4_event_context_init(NULL);
 
        h1 = open_backend(pc, ev_ctx, cmdline_lp_ctx, backend1, remote1);
        if (h1 == NULL)

diff --git a/source/lib/registry/tools/regpatch.c b/source/lib/registry/tools/regpatch.c
index 9285459d8501db55b3fecbbaeb1525e5a1567ee7..1170fbadb432e69d491ff3e753b4eab67edab359 100644 (file)
--- a/source/lib/registry/tools/regpatch.c
+++ b/source/lib/registry/tools/regpatch.c
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
        while((opt = poptGetNextOpt(pc)) != -1) {
        }
 
-       ev = event_context_init(NULL);
+       ev = s4_event_context_init(NULL);
 
        if (remote) {
                h = reg_common_open_remote (remote, cmdline_lp_ctx, cmdline_credentials);

diff --git a/source/lib/registry/tools/regshell.c b/source/lib/registry/tools/regshell.c
index 80eafcc4a29a69edfed366c5293b53f0cbc77956..4e859df3f60c7f8effbe02700518983ed15f4dab 100644 (file)
--- a/source/lib/registry/tools/regshell.c
+++ b/source/lib/registry/tools/regshell.c
@@ -517,7 +517,7 @@ int main(int argc, char **argv)
 
        ctx = talloc_zero(NULL, struct regshell_context);
 
-       ev_ctx = event_context_init(ctx);
+       ev_ctx = s4_event_context_init(ctx);
 
        if (remote != NULL) {
                ctx->registry = reg_common_open_remote(remote, cmdline_lp_ctx, 

diff --git a/source/lib/registry/tools/regtree.c b/source/lib/registry/tools/regtree.c
index 440399f7645470f8e761a63904a6e13816c6cf6f..daca6957a1aa47ed56152776cabff4e0250c866a 100644 (file)
--- a/source/lib/registry/tools/regtree.c
+++ b/source/lib/registry/tools/regtree.c
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
        while((opt = poptGetNextOpt(pc)) != -1) {
        }
 
-       ev_ctx = event_context_init(NULL);
+       ev_ctx = s4_event_context_init(NULL);
 
        if (remote != NULL) {
                h = reg_common_open_remote(remote, cmdline_lp_ctx, cmdline_credentials);

diff --git a/source/libcli/nbt/pynbt.c b/source/libcli/nbt/pynbt.c
index 626a63ac4817678583d11c1a4f8180553059fc95..7978bfef904711a0a9a9edfada3b1a1f1d1225a6 100644 (file)
--- a/source/libcli/nbt/pynbt.c
+++ b/source/libcli/nbt/pynbt.c
@@ -47,7 +47,7 @@ static PyObject *py_nbt_node_init(PyObject *self, PyObject *args, PyObject *kwar
        if (ret->mem_ctx == NULL)
                return NULL;
 
-       ev = event_context_init(ret->mem_ctx);
+       ev = s4_event_context_init(ret->mem_ctx);
        ret->socket = nbt_name_socket_init(ret->mem_ctx, ev, lp_iconv_convenience(global_loadparm)); 
        return (PyObject *)ret;
 }

diff --git a/source/libcli/swig/libcli_smb_wrap.c b/source/libcli/swig/libcli_smb_wrap.c
index de8e6ba1e4ce79fbcd1fdfa4e9d58006aaa8b32a..a3ea079b83d9cc3dc6915ac97cdf33fab65a6501 100644 (file)
--- a/source/libcli/swig/libcli_smb_wrap.c
+++ b/source/libcli/swig/libcli_smb_wrap.c
@@ -2621,7 +2621,7 @@ SWIGINTERN PyObject *_wrap_smbcli_sock_connect_byname(PyObject *SWIGUNUSEDPARM(s
     (char *) "host",(char *) "ports",(char *) "resolve_ctx",(char *) "event_ctx", NULL 
   };
   
-  arg5 = event_context_init(NULL);
+  arg5 = s4_event_context_init(NULL);
   arg3 = NULL;
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:smbcli_sock_connect_byname",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);

diff --git a/source/libnet/py_net.c b/source/libnet/py_net.c
index 443da299c7ca7d915c603d4321a96deb10008bcb..3736454fa0aa8e28d7946cad0e2d653598564b99 100644 (file)
--- a/source/libnet/py_net.c
+++ b/source/libnet/py_net.c
@@ -47,7 +47,7 @@ static PyObject *py_net_join(PyObject *cls, PyObject *args, PyObject *kwargs)
 
        /* FIXME: we really need to get a context from the caller or we may end
         * up with 2 event contexts */
-       ev = event_context_init(NULL);
+       ev = s4_event_context_init(NULL);
        mem_ctx = talloc_new(ev);
 
        libnet_ctx = py_net_ctx(cls, ev);

diff --git a/source/librpc/rpc/pyrpc.c b/source/librpc/rpc/pyrpc.c
index d8344be511f081ee01dcf06d46f712c0619048c6..a59f355d436411732f819969808d59e4777bbac4 100644 (file)
--- a/source/librpc/rpc/pyrpc.c
+++ b/source/librpc/rpc/pyrpc.c
@@ -336,7 +336,7 @@ static PyObject *dcerpc_interface_new(PyTypeObject *self, PyObject *args, PyObje
        }
        ret = PyObject_New(dcerpc_InterfaceObject, &dcerpc_InterfaceType);
 
-       event_ctx = event_context_init(mem_ctx);
+       event_ctx = s4_event_context_init(mem_ctx);
 
        /* Create a dummy interface table struct. TODO: In the future, we should rather just allow 
         * connecting without requiring an interface table.

diff --git a/source/smbd/process_prefork.c b/source/smbd/process_prefork.c
index 839c7209d2b47502f099af951ffb328a8860e99c..2ffb724a6c63539a438a86b955ed23dc852b6cfd 100644 (file)
--- a/source/smbd/process_prefork.c
+++ b/source/smbd/process_prefork.c
@@ -115,7 +115,7 @@ static void prefork_new_task(struct event_context *ev,
        pid = getpid();
 
        /* This is now the child code. We need a completely new event_context to work with */
-       ev2 = event_context_init(NULL);
+       ev2 = s4_event_context_init(NULL);
 
        /* the service has given us a private pointer that
           encapsulates the context it needs for this new connection -
@@ -173,7 +173,7 @@ static void prefork_new_task(struct event_context *ev,
        talloc_free(ev2);
        
        /* But we need a events system to handle reaping children */
-       ev_parent = event_context_init(NULL);
+       ev_parent = s4_event_context_init(NULL);
        
        /* TODO: Handle some events... */
        

diff --git a/source/smbd/process_standard.c b/source/smbd/process_standard.c
index 820859400e7e0ef503c20dd8711b2779a494bd6d..3f2936bb2647f6a30227722ceae8325a2bf037f1 100644 (file)
--- a/source/smbd/process_standard.c
+++ b/source/smbd/process_standard.c
@@ -92,7 +92,7 @@ static void standard_accept_connection(struct event_context *ev,
        pid = getpid();
 
        /* This is now the child code. We need a completely new event_context to work with */
-       ev2 = event_context_init(NULL);
+       ev2 = s4_event_context_init(NULL);
 
        /* the service has given us a private pointer that
           encapsulates the context it needs for this new connection -
@@ -161,7 +161,7 @@ static void standard_new_task(struct event_context *ev,
        pid = getpid();
 
        /* This is now the child code. We need a completely new event_context to work with */
-       ev2 = event_context_init(NULL);
+       ev2 = s4_event_context_init(NULL);
 
        /* the service has given us a private pointer that
           encapsulates the context it needs for this new connection -

diff --git a/source/smbd/process_thread.c b/source/smbd/process_thread.c
index 5a45cdfeac6e6bee2977007031f1abcf1393190a..540d956420045771be1bf83e30a1689d0f1df4b9 100644 (file)
--- a/source/smbd/process_thread.c
+++ b/source/smbd/process_thread.c
@@ -77,7 +77,7 @@ static void thread_accept_connection(struct event_context *ev,
        struct new_conn_state *state;
        struct event_context *ev2;
 
-       ev2 = event_context_init(ev);
+       ev2 = s4_event_context_init(ev);
        if (ev2 == NULL) return;
 
        state = talloc(ev2, struct new_conn_state);
@@ -160,7 +160,7 @@ static void thread_new_task(struct event_context *ev,
        struct new_task_state *state;
        struct event_context *ev2;
 
-       ev2 = event_context_init(ev);
+       ev2 = s4_event_context_init(ev);
        if (ev2 == NULL) return;
 
        state = talloc(ev2, struct new_task_state);

diff --git a/source/smbd/server.c b/source/smbd/server.c
index c1c8b6368f6422b354a2ecaeef9535c388105316..74c87c68a447d45d3f1c8cd189ff53c1d6e5690a 100644 (file)
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -313,7 +313,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
        
        /* the event context is the top level structure in smbd. Everything else
           should hang off that */
-       event_ctx = event_context_init(talloc_autofree_context());
+       event_ctx = s4_event_context_init(talloc_autofree_context());
 
        if (event_ctx == NULL) {
                DEBUG(0,("Initializing event context failed\n"));

diff --git a/source/torture/gentest.c b/source/torture/gentest.c
index 15cf32196533e7f0bcda9c27a8c43b089165ed24..af5a95e7517f8f8d0416f5ebce8b4deaf2a9555a 100644 (file)
--- a/source/torture/gentest.c
+++ b/source/torture/gentest.c
@@ -3219,7 +3219,7 @@ static bool split_unc_name(const char *unc, char **server, char **share)
 
        printf("seed=%u\n", options.seed);
 
-       ev = event_context_init(talloc_autofree_context());
+       ev = s4_event_context_init(talloc_autofree_context());
 
        gensec_init(lp_ctx);
 

diff --git a/source/torture/locktest.c b/source/torture/locktest.c
index 4a0dfc2a6f10eff20ff35e3c97eafed02f012bcc..9c7bffb6f4c99ce286fa084b7e46de7da57de0ff 100644 (file)
--- a/source/torture/locktest.c
+++ b/source/torture/locktest.c
@@ -637,7 +637,7 @@ static void usage(poptContext pc)
                servers[1] = servers[0];
        }
 
-       ev = event_context_init(talloc_autofree_context());
+       ev = s4_event_context_init(talloc_autofree_context());
 
        gensec_init(lp_ctx);
 

diff --git a/source/torture/locktest2.c b/source/torture/locktest2.c
index 1784a0a729490c11668b311dd20c845b2379b914..e6c4728f0ddf854aba43b39ff2af1371a6a86f8b 100644 (file)
--- a/source/torture/locktest2.c
+++ b/source/torture/locktest2.c
@@ -550,7 +550,7 @@ static void usage(void)
        DEBUG(0,("seed=%u\n", seed));
        srandom(seed);
 
-       ev = event_context_init(talloc_autofree_context());
+       ev = s4_event_context_init(talloc_autofree_context());
 
        locking_init(1);
        lp_smbcli_options(lp_ctx, &options);

diff --git a/source/torture/masktest.c b/source/torture/masktest.c
index 255d94382c207eecf8de6b15e08f6483ff352a7a..35e9a57fe82bd1fcb8956bf142cfbfd65e32e3a2 100644 (file)
--- a/source/torture/masktest.c
+++ b/source/torture/masktest.c
@@ -355,7 +355,7 @@ static void usage(poptContext pc)
 
        lp_ctx = cmdline_lp_ctx;
 
-       ev = event_context_init(talloc_autofree_context());
+       ev = s4_event_context_init(talloc_autofree_context());
 
        gensec_init(lp_ctx);
 

diff --git a/source/torture/smbtorture.c b/source/torture/smbtorture.c
index e1e84247b4b73491727c1394d6830c2e7548f45f..37d7d171caddb788287a64c12daefcca6d076f72 100644 (file)
--- a/source/torture/smbtorture.c
+++ b/source/torture/smbtorture.c
@@ -689,7 +689,7 @@ int main(int argc,char *argv[])
                exit(1);
        }
 
-       torture = torture_context_init(event_context_init(NULL), ui_ops);
+       torture = torture_context_init(s4_event_context_init(NULL), ui_ops);
        if (basedir != NULL) {
                if (basedir[0] != '/') {
                        fprintf(stderr, "Please specify an absolute path to --basedir\n");

diff --git a/source/utils/net/net.c b/source/utils/net/net.c
index a87b2665681fa3c33b25f1e4dbe9838e7fb51934..1c834fe4f09da6ccd2e83424dc8dfa67baddbbdf 100644 (file)
--- a/source/utils/net/net.c
+++ b/source/utils/net/net.c
@@ -185,7 +185,7 @@ static int binary_net(int argc, const char **argv)
 
        dcerpc_init();
 
-       ev = event_context_init(NULL);
+       ev = s4_event_context_init(NULL);
        if (!ev) {
                d_printf("Failed to create an event context\n");
                exit(1);

diff --git a/source/utils/nmblookup.c b/source/utils/nmblookup.c
index 980e06602d91f3be3c9faa6b599f3c17f1af45c5..a74ab5a42e8392fa7409d99f7dd58e8c9933534d 100644 (file)
--- a/source/utils/nmblookup.c
+++ b/source/utils/nmblookup.c
@@ -359,7 +359,7 @@ int main(int argc, const char *argv[])
 
        load_interfaces(NULL, lp_interfaces(cmdline_lp_ctx), &ifaces);
 
-       ev = event_context_init(talloc_autofree_context());
+       ev = s4_event_context_init(talloc_autofree_context());
 
        while (poptPeekArg(pc)) {
                const char *name = poptGetArg(pc);

diff --git a/source/utils/ntlm_auth.c b/source/utils/ntlm_auth.c
index 95029deffa77aee114d8963c8d45f4e75c7e7a76..6d62968b05467703cc47110e4d26c3907cf4515c 100644 (file)
--- a/source/utils/ntlm_auth.c
+++ b/source/utils/ntlm_auth.c
@@ -462,7 +462,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
                return;
        }
 
-       ev = event_context_init(state);
+       ev = s4_event_context_init(state);
        if (!ev) {
                exit(1);
        }