s3:utils: make use of samba_tevent_context_init()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index 7c90b54de76d8a6902ed3f95f8b8a4c221592840..aab5773dccd1e6ed508405fd8f209f2a9257e9a5 100644 (file)
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -522,7 +522,7 @@ int main(int argc, const char **argv)
                goto done;
        }
 
-       evt_ctx = tevent_context_init(mem_ctx);
+       evt_ctx = samba_tevent_context_init(mem_ctx);
        if (evt_ctx == NULL) {
                d_fprintf(stderr, "ERROR: could not init event context\n");
                goto done;

diff --git a/source3/utils/dbwrap_torture.c b/source3/utils/dbwrap_torture.c
index fb4ed6d4ec1bdfa03775a248faadf7148c899ae6..9ece297288721131191c7dbef244cbf765386ba1 100644 (file)
--- a/source3/utils/dbwrap_torture.c
+++ b/source3/utils/dbwrap_torture.c
@@ -286,7 +286,7 @@ int main(int argc, const char *argv[])
 
        lp_load_global(get_dyn_CONFIGFILE());
 
-       ev_ctx = tevent_context_init(mem_ctx);
+       ev_ctx = samba_tevent_context_init(mem_ctx);
        if (ev_ctx == NULL) {
                d_fprintf(stderr, "ERROR: could not init event context\n");
                goto done;

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 465d2a08216ae1cb6b03d383307ec63b905ba199..34736416302e708ad89f8e0aaa28d0466d338656 100644 (file)
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -950,7 +950,7 @@ static struct functable net_func[] = {
        /* Failing to init the msg_ctx isn't a fatal error. Only
           root-level things (joining/leaving domains etc.) will be denied. */
 
-       c->msg_ctx = messaging_init(c, event_context_init(c));
+       c->msg_ctx = messaging_init(c, samba_tevent_context_init(c));
 
        rc = net_run_function(c, argc_new-1, argv_new+1, "net", net_func);
 

diff --git a/source3/utils/net_g_lock.c b/source3/utils/net_g_lock.c
index 05a7392eb91a1f1b7fb5664b8a6e7a3da4013c8a..8de5c7cc33883eb73f471d4fabe4fd1ae2a94ddb 100644 (file)
--- a/source3/utils/net_g_lock.c
+++ b/source3/utils/net_g_lock.c
@@ -31,7 +31,7 @@ static bool net_g_lock_init(TALLOC_CTX *mem_ctx,
        struct messaging_context *msg = NULL;
        struct g_lock_ctx *g_ctx = NULL;
 
-       ev = tevent_context_init(mem_ctx);
+       ev = samba_tevent_context_init(mem_ctx);
        if (ev == NULL) {
                d_fprintf(stderr, "ERROR: could not init event context\n");
                goto fail;

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 0e4a8cc7b7f5f0ef9ba3728ef33894d6f36ff2b8..47884ff86163ee129a237e67ac13b42440408928 100644 (file)
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1500,7 +1500,7 @@ int main(int argc, const char **argv)
          * routines mostly return True==1 for success, but
          * shell needs 0. */ 
 
-       if (!(evt_ctx = tevent_context_init(NULL)) ||
+       if (!(evt_ctx = samba_tevent_context_init(NULL)) ||
            !(msg_ctx = messaging_init(NULL, evt_ctx))) {
                fprintf(stderr, "could not init messaging context\n");
                TALLOC_FREE(frame);

diff --git a/source3/utils/status.c b/source3/utils/status.c
index 0cb46a5f536540022e3167d9442631ee0f10d88e..28a79d6018536388784da6eddb8102795769b270 100644 (file)
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -422,7 +422,7 @@ static void print_notify_recs(const char *path,
                 * connection, usable by the db_open() calls further
                 * down.
                 */
-               msg_ctx = messaging_init(NULL, event_context_init(NULL));
+               msg_ctx = messaging_init(NULL, samba_tevent_context_init(NULL));
                if (msg_ctx == NULL) {
                        fprintf(stderr, "messaging_init failed\n");
                        ret = -1;