s3:torture: 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/torture/msgtest.c b/source3/torture/msgtest.c
index c7c95c167897b1e3ab3571ebecce3bdab38eefc2..ed28667b8d96f68df86bef1d0505ee30c66a1996 100644 (file)
--- a/source3/torture/msgtest.c
+++ b/source3/torture/msgtest.c
@@ -53,7 +53,7 @@ static void pong_message(struct messaging_context *msg_ctx,
 
        lp_load_global(get_dyn_CONFIGFILE());
 
-       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");
                exit(1);

diff --git a/source3/torture/nbench.c b/source3/torture/nbench.c
index 612dc7db9c51cb01b1594ddae184706e3afcafb7..cb8a410e2eb110a17101cd8febad5673fc034e1d 100644 (file)
--- a/source3/torture/nbench.c
+++ b/source3/torture/nbench.c
@@ -465,7 +465,7 @@ bool run_nbench2(int dummy)
                        strerror(errno));
                return false;
        }
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                goto fail;
        }

diff --git a/source3/torture/test_addrchange.c b/source3/torture/test_addrchange.c
index 7c09f917c9eda93809f96aa17ee3a294e50fafda..daf0488aa18a15e3a6f0cd1e8592fd25ac4b37e2 100644 (file)
--- a/source3/torture/test_addrchange.c
+++ b/source3/torture/test_addrchange.c
@@ -31,7 +31,7 @@ bool run_addrchange(int dummy)
        NTSTATUS status;
        int i;
 
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                d_fprintf(stderr, "tevent_context_init failed\n");
                return -1;

diff --git a/source3/torture/test_async_echo.c b/source3/torture/test_async_echo.c
index cca697598166de00c3c390b5faa7af6afc69021f..6df95dd51e86d22d9bddb501ae91a5fb40998e18 100644 (file)
--- a/source3/torture/test_async_echo.c
+++ b/source3/torture/test_async_echo.c
@@ -72,7 +72,7 @@ bool run_async_echo(int dummy)
 
        printf("Starting ASYNC_ECHO\n");
 
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                printf("tevent_context_init failed\n");
                goto fail;

diff --git a/source3/torture/test_chain3.c b/source3/torture/test_chain3.c
index a4b30ea94055f5dd0c694a824e97a86d2aeb4edc..7be8859d9b9f3153c99ebf7893d637300383d9af 100644 (file)
--- a/source3/torture/test_chain3.c
+++ b/source3/torture/test_chain3.c
@@ -276,7 +276,7 @@ bool run_chain3(int dummy)
        struct tevent_req *req;
        NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-       ev = tevent_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
                goto fail;
        }

diff --git a/source3/torture/test_ctdbconn.c b/source3/torture/test_ctdbconn.c
index d01835250b383690ac3b929fa10809bf1a1353e2..149f06d7ffa99ce7a86ff0bb5bb83e7a48cdca74 100644 (file)
--- a/source3/torture/test_ctdbconn.c
+++ b/source3/torture/test_ctdbconn.c
@@ -221,7 +221,7 @@ bool run_ctdb_conn(int dummy)
        struct tevent_req *req;
        int ret;
 
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                fprintf(stderr, "tevent_context_init failed\n");
                return false;

diff --git a/source3/torture/test_dbwrap_watch.c b/source3/torture/test_dbwrap_watch.c
index 2a21617fe3c3840ffec016384182a751e1a85bd1..9c2a6799561cf838fb5f20e2e57cf14bd2695cc2 100644 (file)
--- a/source3/torture/test_dbwrap_watch.c
+++ b/source3/torture/test_dbwrap_watch.c
@@ -37,7 +37,7 @@ bool run_dbwrap_watch1(int dummy)
        NTSTATUS status;
        bool ret = false;
 
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                fprintf(stderr, "tevent_context_init failed\n");
                goto fail;

diff --git a/source3/torture/test_msg.c b/source3/torture/test_msg.c
index 88b07e742ce0c2ddef6f1077504ff52931b75a9c..2171598ab8f92e0a89449d96af07a0b9662fbc24 100644 (file)
--- a/source3/torture/test_msg.c
+++ b/source3/torture/test_msg.c
@@ -108,7 +108,7 @@ bool run_msg_test(int dummy)
        struct tevent_req *req;
        int ret;
 
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                fprintf(stderr, "tevent_context_init failed\n");
                return false;

diff --git a/source3/torture/test_notify.c b/source3/torture/test_notify.c
index 8d1e96958883f25da5c362a326818de83d43b236..e1755ad20c72c29d593c3b1c4c459e2b53edf628 100644 (file)
--- a/source3/torture/test_notify.c
+++ b/source3/torture/test_notify.c
@@ -197,7 +197,7 @@ bool run_notify_bench2(int dummy)
                return false;
        }
 
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                printf("tevent_context_create failed\n");
                return false;
@@ -660,7 +660,7 @@ bool run_notify_bench3(int dummy)
                return false;
        }
 
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                printf("tevent_context_create failed\n");
                return false;

diff --git a/source3/torture/test_notify_online.c b/source3/torture/test_notify_online.c
index b9ebc00b54bd819dc75e3ee4a8f3abe8db0896f6..d2748f4f3425dc32c218aa758b0cfb6d57b052ce 100644 (file)
--- a/source3/torture/test_notify_online.c
+++ b/source3/torture/test_notify_online.c
@@ -240,7 +240,7 @@ static NTSTATUS notify_online(struct cli_state *cli,
        struct tevent_req *req;
        NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-       ev = event_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
                goto fail;
        }

diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c
index 79ffef19582e12041d7eb3d489e4a1cf9aa4b804..ec695da8f6d49fe20e4feef01aec54b895c487ab 100644 (file)
--- a/source3/torture/test_smb2.c
+++ b/source3/torture/test_smb2.c
@@ -428,9 +428,9 @@ bool run_smb2_session_reconnect(int dummy)
                return false;
        }
 
-       ev = event_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
-               printf("event_context_init() returned NULL\n");
+               printf("samba_tevent_context_init() returned NULL\n");
                return false;
        }
 
@@ -937,9 +937,9 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       ev = event_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
-               printf("event_context_init() returned NULL\n");
+               printf("samba_tevent_context_init() returned NULL\n");
                return false;
        }
 
@@ -1556,9 +1556,9 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       ev = event_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
-               printf("event_context_init() returned NULL\n");
+               printf("samba_tevent_context_init() returned NULL\n");
                return false;
        }
 

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index b59ac30ffd0f73022676d20c51bfbafa180a23cf..825eaf53629a7d395202035e605586be2951319c 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -228,7 +228,7 @@ static bool cli_bad_session_request(int fd,
                goto fail;
        }
 
-       ev = event_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
                goto fail;
        }
@@ -2985,7 +2985,7 @@ static bool run_negprot_nowait(int dummy)
 
        printf("starting negprot nowait test\n");
 
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                return false;
        }
@@ -3723,7 +3723,7 @@ static bool run_oplock4(int dummy)
                return false;
        }
 
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                printf("tevent_context_init failed\n");
                return false;
@@ -6604,7 +6604,7 @@ static void chain1_close_completion(struct tevent_req *req)
 static bool run_chain1(int dummy)
 {
        struct cli_state *cli1;
-       struct event_context *evt = event_context_init(NULL);
+       struct event_context *evt = samba_tevent_context_init(NULL);
        struct tevent_req *reqs[3], *smbreqs[3];
        bool done = false;
        const char *str = "foobar";
@@ -6665,7 +6665,7 @@ static void chain2_tcon_completion(struct tevent_req *req)
 static bool run_chain2(int dummy)
 {
        struct cli_state *cli1;
-       struct event_context *evt = event_context_init(NULL);
+       struct event_context *evt = samba_tevent_context_init(NULL);
        struct tevent_req *reqs[2], *smbreqs[2];
        bool done = false;
        NTSTATUS status;
@@ -7030,7 +7030,7 @@ static bool run_notify_bench(int dummy)
                num_unc_names = 1;
        }
 
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                d_printf("tevent_context_init failed\n");
                return false;
@@ -7566,7 +7566,7 @@ static bool run_tldap(int dummy)
        }
        d_printf("defaultNamingContext: %s\n", basedn);
 
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                d_printf("tevent_context_init failed\n");
                return false;
@@ -8595,7 +8595,7 @@ static bool run_getaddrinfo_send(int dummy)
        struct tevent_req *reqs[4];
        int i;
 
-       ev = event_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
                goto fail;
        }

diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 439e186c90d24505638065237cd98197c149fe79..54365e0350be4a93fe707373b14bbe6e4ac2a999 100644 (file)
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -459,7 +459,7 @@ int main(int argc, char *argv[])
        char *filename = NULL;
        char cwd[MAXPATHLEN];
        TALLOC_CTX *frame = talloc_stackframe();
-       struct tevent_context *ev = tevent_context_init(NULL);
+       struct tevent_context *ev = samba_tevent_context_init(NULL);
        struct auth_session_info *session_info = NULL;
        NTSTATUS status = NT_STATUS_OK;