s3:lib: 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/lib/g_lock.c b/source3/lib/g_lock.c
index fbd90225f094a74f36a9adecfc0b2780e052219f..8c7a6c203b23afb484f706b1f17a4970c6d7fc88 100644 (file)
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -315,7 +315,7 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name,
        struct timeval end;
        NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-       ev = tevent_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
                goto fail;
        }
@@ -513,7 +513,7 @@ static bool g_lock_init_all(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/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 7899477ba09119caed647375e00483a7caaf2f7e..949fb272805e599340940123fbe0120a9dd81820 100644 (file)
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -68,9 +68,9 @@ struct ctdbd_connection *messaging_ctdbd_connection(void)
                struct event_context *ev;
                struct messaging_context *msg;
 
-               ev = event_context_init(NULL);
+               ev = samba_tevent_context_init(NULL);
                if (!ev) {
-                       DEBUG(0,("event_context_init failed\n"));
+                       DEBUG(0,("samba_tevent_context_init failed\n"));
                }
 
                msg = messaging_init(NULL, ev);

diff --git a/source3/lib/msg_channel.c b/source3/lib/msg_channel.c
index c68c11ec2f0c8210895dc511ebc17e418728993b..537b1627370639fda725008a374561229db1e139 100644 (file)
--- a/source3/lib/msg_channel.c
+++ b/source3/lib/msg_channel.c
@@ -138,7 +138,7 @@ int msg_channel_init(TALLOC_CTX *mem_ctx, struct messaging_context *msg,
        int err = ENOMEM;
        bool ok;
 
-       ev = tevent_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
                goto fail;
        }

diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index 765580fd81d854c35ee01c8161cccfba46a65a6c..8e9123442240ee8a130fb61bbc643a6b3ec66569 100644 (file)
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -901,7 +901,7 @@ int tldap_sasl_bind(struct tldap_context *ld,
        struct tevent_req *req;
        int result;
 
-       ev = event_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
                result = TLDAP_NO_MEMORY;
                goto fail;
@@ -1824,7 +1824,7 @@ int tldap_search(struct tldap_context *ld,
        state.mem_ctx = mem_ctx;
        state.rc = TLDAP_SUCCESS;
 
-       ev = event_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
                state.rc = TLDAP_NO_MEMORY;
                goto fail;
@@ -2141,7 +2141,7 @@ int tldap_add(struct tldap_context *ld, const char *dn,
        struct tevent_req *req;
        int result;
 
-       ev = event_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
                result = TLDAP_NO_MEMORY;
                goto fail;
@@ -2241,7 +2241,7 @@ int tldap_modify(struct tldap_context *ld, const char *dn,
        struct tevent_req *req;
        int result;
 
-       ev = event_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
                result = TLDAP_NO_MEMORY;
                goto fail;
@@ -2317,7 +2317,7 @@ int tldap_delete(struct tldap_context *ld, const char *dn,
        struct tevent_req *req;
        int result;
 
-       ev = event_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
                result = TLDAP_NO_MEMORY;
                goto fail;

diff --git a/source3/lib/tldap_util.c b/source3/lib/tldap_util.c
index 41d89815d0258194136cc055afc3e9b609ead6e1..1ffb264a132173be2484b06f044c7a025e4d7b3a 100644 (file)
--- a/source3/lib/tldap_util.c
+++ b/source3/lib/tldap_util.c
@@ -514,7 +514,7 @@ int tldap_fetch_rootdse(struct tldap_context *ld)
        struct tevent_req *req;
        int result;
 
-       ev = event_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
                result = TLDAP_NO_MEMORY;
                goto fail;

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index e45efea69bde4baeb84609c00924a426cfda6ea3..679af9ccb4337c5ef4544628ae29c5e3b4569b41 100644 (file)
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -695,7 +695,7 @@ NTSTATUS open_socket_out(const struct sockaddr_storage *pss, uint16_t port,
        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;
        }