Merge branch 'master' of ssh://git.samba.org/data/git/samba

1 files changed, 17 insertions, 16 deletions

diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 18784135cc..e30d5032fb 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -23,10 +23,10 @@
 */
 
 #include "includes.h"
+#include <tevent.h>
+#include "lib/socket/socket.h"
 #include "../lib/util/asn1.h"
 #include "../lib/util/dlinklist.h"
-#include "lib/events/events.h"
-#include "lib/socket/socket.h"
 #include "libcli/ldap/ldap.h"
 #include "libcli/ldap/ldap_proto.h"
 #include "libcli/ldap/ldap_client.h"
@@ -229,11 +229,11 @@ static void ldap_io_handler(struct tevent_context *ev, struct tevent_fd *fde,
 {
 	struct ldap_connection *conn = talloc_get_type(private_data, 
 						       struct ldap_connection);
-	if (flags & EVENT_FD_WRITE) {
+	if (flags & TEVENT_FD_WRITE) {
 		packet_queue_run(conn->packet);
 		if (!tls_enabled(conn->sock)) return;
 	}
-	if (flags & EVENT_FD_READ) {
+	if (flags & TEVENT_FD_READ) {
 		ldap_read_io_handler(private_data, flags);
 	}
 }
@@ -387,14 +387,15 @@ static void ldap_connect_got_sock(struct composite_context *ctx,
 				  struct ldap_connection *conn) 
 {
 	/* setup a handler for events on this socket */
-	conn->event.fde = event_add_fd(conn->event.event_ctx, conn->sock, 
-				       socket_get_fd(conn->sock), 
-				       EVENT_FD_READ | EVENT_FD_AUTOCLOSE, ldap_io_handler, conn);
+	conn->event.fde = tevent_add_fd(conn->event.event_ctx, conn->sock,
+					socket_get_fd(conn->sock),
+					TEVENT_FD_READ, ldap_io_handler, conn);
 	if (conn->event.fde == NULL) {
 		composite_error(ctx, NT_STATUS_INTERNAL_ERROR);
 		return;
 	}
 
+	tevent_fd_set_close_fn(conn->event.fde, socket_tevent_fd_close_fn);
 	socket_set_flags(conn->sock, SOCKET_FLAG_NOCLOSE);
 
 	talloc_steal(conn, conn->sock);
@@ -621,8 +622,8 @@ _PUBLIC_ struct ldap_request *ldap_request_send(struct ldap_connection *conn,
 		req->state = LDAP_REQUEST_DONE;
 		/* we can't call the async callback now, as it isn't setup, so
 		   call it as next event */
-		event_add_timed(conn->event.event_ctx, req, timeval_zero(),
-				ldap_request_complete, req);
+		tevent_add_timer(conn->event.event_ctx, req, timeval_zero(),
+				 ldap_request_complete, req);
 		return req;
 	}
 
@@ -630,17 +631,17 @@ _PUBLIC_ struct ldap_request *ldap_request_send(struct ldap_connection *conn,
 	DLIST_ADD(conn->pending, req);
 
 	/* put a timeout on the request */
-	req->time_event = event_add_timed(conn->event.event_ctx, req, 
-					  timeval_current_ofs(conn->timeout, 0),
-					  ldap_request_timeout, req);
+	req->time_event = tevent_add_timer(conn->event.event_ctx, req,
+					   timeval_current_ofs(conn->timeout, 0),
+					   ldap_request_timeout, req);
 
 	return req;
 
 failed:
 	req->status = status;
 	req->state = LDAP_REQUEST_ERROR;
-	event_add_timed(conn->event.event_ctx, req, timeval_zero(),
-			ldap_request_complete, req);
+	tevent_add_timer(conn->event.event_ctx, req, timeval_zero(),
+			 ldap_request_complete, req);
 
 	return req;
 }
@@ -653,7 +654,7 @@ failed:
 _PUBLIC_ NTSTATUS ldap_request_wait(struct ldap_request *req)
 {
 	while (req->state < LDAP_REQUEST_DONE) {
-		if (event_loop_once(req->conn->event.event_ctx) != 0) {
+		if (tevent_loop_once(req->conn->event.event_ctx) != 0) {
 			req->status = NT_STATUS_UNEXPECTED_NETWORK_ERROR;
 			break;
 		}
@@ -768,7 +769,7 @@ _PUBLIC_ NTSTATUS ldap_result_n(struct ldap_request *req, int n, struct ldap_mes
 	NT_STATUS_HAVE_NO_MEMORY(req);
 
 	while (req->state < LDAP_REQUEST_DONE && n >= req->num_replies) {
-		if (event_loop_once(req->conn->event.event_ctx) != 0) {
+		if (tevent_loop_once(req->conn->event.event_ctx) != 0) {
 			return NT_STATUS_UNEXPECTED_NETWORK_ERROR;
 		}
 	}