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

10 files changed, 234 insertions, 460 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4cd25c8cee..73b2989421 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -339,7 +339,8 @@ UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \
 		   ../lib/util/util.o ../lib/util/fsusage.o \
 		   ../lib/util/params.o ../lib/util/talloc_stack.o \
 		   ../lib/util/genrand.o ../lib/util/util_net.o \
-		   ../lib/util/become_daemon.o ../lib/util/system.o
+		   ../lib/util/become_daemon.o ../lib/util/system.o \
+		   ../lib/util/tevent_unix.o
 
 CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \
 			 ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3ca94b9192..daeef637ca 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1243,15 +1243,6 @@ bool is_valid_policy_hnd(const POLICY_HND *hnd);
 bool policy_hnd_equal(const struct policy_handle *hnd1,
 		      const struct policy_handle *hnd2);
 const char *strip_hostname(const char *s);
-struct async_req *read_pkt_send(TALLOC_CTX *mem_ctx,
-				struct event_context *ev,
-				int fd, size_t initial,
-				ssize_t (*more)(uint8_t *buf, size_t buflen,
-						void *priv),
-				void *priv);
-ssize_t read_pkt_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
-		      uint8_t **pbuf, int *perr);
-
 
 /* The following definitions come from lib/util_file.c  */
 
@@ -3117,7 +3108,7 @@ struct packet_struct *receive_dgram_packet(int fd, int t,
 bool match_mailslot_name(struct packet_struct *p, const char *mailslot_name);
 int matching_len_bits(unsigned char *p1, unsigned char *p2, size_t len);
 void sort_query_replies(char *data, int n, struct in_addr ip);
-int name_mangle( char *In, char *Out, char name_type );
+char *name_mangle(TALLOC_CTX *mem_ctx, char *In, char name_type);
 int name_extract(char *buf,int ofs, fstring name);
 int name_len(char *s1);
 
diff --git a/source3/lib/util.c b/source3/lib/util.c
index cda1fb474d..89f7be8e6c 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -3145,102 +3145,3 @@ const char *strip_hostname(const char *s)
 
 	return s;
 }
-
-struct read_pkt_state {
-	struct event_context *ev;
-	int fd;
-	uint8_t *buf;
-	ssize_t (*more)(uint8_t *buf, size_t buflen, void *priv);
-	void *priv;
-};
-
-static void read_pkt_done(struct async_req *subreq);
-
-struct async_req *read_pkt_send(TALLOC_CTX *mem_ctx,
-				struct event_context *ev,
-				int fd, size_t initial,
-				ssize_t (*more)(uint8_t *buf, size_t buflen,
-						void *priv),
-				void *priv)
-{
-	struct async_req *result, *subreq;
-	struct read_pkt_state *state;
-
-	if (!async_req_setup(mem_ctx, &result, &state,
-			     struct read_pkt_state)) {
-		return NULL;
-	}
-	state->ev = ev;
-	state->fd = fd;
-	state->more = more;
-
-	state->buf = talloc_array(state, uint8_t, initial);
-	if (state->buf == NULL) {
-		goto fail;
-	}
-	subreq = recvall_send(state, ev, fd, state->buf, initial, 0);
-	if (subreq == NULL) {
-		goto fail;
-	}
-	subreq->async.fn = read_pkt_done;
-	subreq->async.priv = result;
-	return result;
- fail:
-	TALLOC_FREE(result);
-	return NULL;
-}
-
-static void read_pkt_done(struct async_req *subreq)
-{
-	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
-	struct read_pkt_state *state = talloc_get_type_abort(
-		req->private_data, struct read_pkt_state);
-	size_t current_size;
-	ssize_t received;
-	ssize_t more;
-	int err;
-
-	received = recvall_recv(subreq, &err);
-	TALLOC_FREE(subreq);
-	if (received == -1) {
-		async_req_error(req, err);
-		return;
-	}
-	current_size = talloc_get_size(state->buf);
-
-	more = state->more(state->buf, current_size, state->priv);
-	if (more < 0) {
-		async_req_error(req, EIO);
-		return;
-	}
-	if (more == 0) {
-		async_req_done(req);
-		return;
-	}
-	state->buf = TALLOC_REALLOC_ARRAY(state, state->buf, uint8_t,
-					  current_size + more);
-	if (async_req_nomem(state->buf, req)) {
-		return;
-	}
-	subreq = recvall_send(state, state->ev, state->fd,
-			      state->buf + current_size, more, 0);
-	if (async_req_nomem(subreq, req)) {
-		return;
-	}
-	subreq->async.fn = read_pkt_done;
-	subreq->async.priv = req;
-}
-
-ssize_t read_pkt_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
-		      uint8_t **pbuf, int *perr)
-{
-	struct read_pkt_state *state = talloc_get_type_abort(
-		req->private_data, struct read_pkt_state);
-
-	if (async_req_is_errno(req, perr)) {
-		return -1;
-	}
-	*pbuf = talloc_move(mem_ctx, &state->buf);
-	return talloc_get_size(*pbuf);
-}
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index c46aa2ac49..83e8a9d355 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -953,7 +953,7 @@ struct open_socket_out_state {
 	int wait_nsec;
 };
 
-static void open_socket_out_connected(struct async_req *subreq);
+static void open_socket_out_connected(struct tevent_req *subreq);
 
 static int open_socket_out_state_destructor(struct open_socket_out_state *s)
 {
@@ -974,7 +974,8 @@ struct async_req *open_socket_out_send(TALLOC_CTX *mem_ctx,
 				       int timeout)
 {
 	char addr[INET6_ADDRSTRLEN];
-	struct async_req *result, *subreq;
+	struct async_req *result;
+	struct tevent_req *subreq;
 	struct open_socket_out_state *state;
 	NTSTATUS status;
 
@@ -1026,13 +1027,14 @@ struct async_req *open_socket_out_send(TALLOC_CTX *mem_ctx,
 				    (struct sockaddr *)&state->ss,
 				    state->salen);
 	if ((subreq == NULL)
-	    || !async_req_set_timeout(subreq, state->ev,
-				      timeval_set(0, state->wait_nsec))) {
+	    || !tevent_req_set_endtime(
+		    subreq, state->ev,
+		    timeval_current_ofs(0, state->wait_nsec))) {
 		status = NT_STATUS_NO_MEMORY;
 		goto post_status;
 	}
 	subreq->async.fn = open_socket_out_connected;
-	subreq->async.priv = result;
+	subreq->async.private_data = result;
 	return result;
 
  post_status:
@@ -1045,18 +1047,18 @@ struct async_req *open_socket_out_send(TALLOC_CTX *mem_ctx,
 	return NULL;
 }
 
-static void open_socket_out_connected(struct async_req *subreq)
+static void open_socket_out_connected(struct tevent_req *subreq)
 {
 	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
+		subreq->async.private_data, struct async_req);
 	struct open_socket_out_state *state = talloc_get_type_abort(
 		req->private_data, struct open_socket_out_state);
-	int err;
+	int ret;
 	int sys_errno;
 
-	err = async_connect_recv(subreq, &sys_errno);
+	ret = async_connect_recv(subreq, &sys_errno);
 	TALLOC_FREE(subreq);
-	if (err == 0) {
+	if (ret == 0) {
 		async_req_done(req);
 		return;
 	}
@@ -1083,13 +1085,14 @@ static void open_socket_out_connected(struct async_req *subreq)
 		if (async_req_nomem(subreq, req)) {
 			return;
 		}
-		if (!async_req_set_timeout(subreq, state->ev,
-					   timeval_set(0, state->wait_nsec))) {
+		if (!tevent_req_set_endtime(
+			    subreq, state->ev,
+			    timeval_current_ofs(0, state->wait_nsec))) {
 			async_req_error(req, ENOMEM);
 			return;
 		}
 		subreq->async.fn = open_socket_out_connected;
-		subreq->async.priv = req;
+		subreq->async.private_data = req;
 		return;
 	}
 
diff --git a/source3/lib/wb_reqtrans.c b/source3/lib/wb_reqtrans.c
index 9bf6f29105..a5adf8f108 100644
--- a/source3/lib/wb_reqtrans.c
+++ b/source3/lib/wb_reqtrans.c
@@ -27,9 +27,7 @@
 
 struct req_read_state {
 	struct winbindd_request *wb_req;
-	struct tevent_context *ev;
 	size_t max_extra_data;
-	int fd;
 };
 
 bool async_req_is_wbcerr(struct async_req *req, wbcErr *pwbc_err)
@@ -83,145 +81,91 @@ wbcErr async_req_simple_recv_wbcerr(struct async_req *req)
 	return WBC_ERR_SUCCESS;
 }
 
-static void wb_req_read_len(struct async_req *subreq);
-static void wb_req_read_main(struct async_req *subreq);
-static void wb_req_read_extra(struct async_req *subreq);
+static ssize_t wb_req_more(uint8_t *buf, size_t buflen, void *private_data);
+static void wb_req_read_done(struct tevent_req *subreq);
 
 struct async_req *wb_req_read_send(TALLOC_CTX *mem_ctx,
 				   struct tevent_context *ev,
 				   int fd, size_t max_extra_data)
 {
-	struct async_req *result, *subreq;
+	struct async_req *result;
+	struct tevent_req *subreq;
 	struct req_read_state *state;
 
 	if (!async_req_setup(mem_ctx, &result, &state,
 			     struct req_read_state)) {
 		return NULL;
 	}
-	state->fd = fd;
-	state->ev = ev;
 	state->max_extra_data = max_extra_data;
-	state->wb_req = talloc(state, struct winbindd_request);
-	if (state->wb_req == NULL) {
-		goto nomem;
-	}
 
-	subreq = recvall_send(state, ev, state->fd, &(state->wb_req->length),
-			      sizeof(state->wb_req->length), 0);
+	subreq = read_packet_send(state, ev, fd, 4, wb_req_more, state);
 	if (subreq == NULL) {
 		goto nomem;
 	}
 
-	subreq->async.fn = wb_req_read_len;
-	subreq->async.priv = result;
+	subreq->async.fn = wb_req_read_done;
+	subreq->async.private_data = result;
 	return result;
-
  nomem:
 	TALLOC_FREE(result);
 	return NULL;
 }
 
-static void wb_req_read_len(struct async_req *subreq)
+static ssize_t wb_req_more(uint8_t *buf, size_t buflen, void *private_data)
 {
-	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
 	struct req_read_state *state = talloc_get_type_abort(
-		req->private_data, struct req_read_state);
-	int err;
-	ssize_t ret;
-
-	ret = recvall_recv(subreq, &err);
-	TALLOC_FREE(subreq);
-	if (ret < 0) {
-		async_req_error(req, map_wbc_err_from_errno(err));
-		return;
-	}
+		private_data, struct req_read_state);
+	struct winbindd_request *req = (struct winbindd_request *)buf;
 
-	if (state->wb_req->length != sizeof(struct winbindd_request)) {
-		DEBUG(0, ("wb_req_read_len: Invalid request size received: "
-			  "%d (expected %d)\n", (int)state->wb_req->length,
-			  (int)sizeof(struct winbindd_request)));
-		async_req_error(req, WBC_ERR_INVALID_RESPONSE);
-		return;
+	if (buflen == 4) {
+		if (req->length != sizeof(struct winbindd_request)) {
+			DEBUG(0, ("wb_req_read_len: Invalid request size "
+				  "received: %d (expected %d)\n",
+				  (int)req->length,
+				  (int)sizeof(struct winbindd_request)));
+			return -1;
+		}
+		return sizeof(struct winbindd_request) - 4;
 	}
 
-	subreq = recvall_send(
-		req, state->ev, state->fd, (uint32 *)(state->wb_req)+1,
-		sizeof(struct winbindd_request) - sizeof(uint32), 0);
-	if (async_req_nomem(subreq, req)) {
-		return;
+	if ((state->max_extra_data != 0)
+	    && (req->extra_len > state->max_extra_data)) {
+		DEBUG(3, ("Got request with %d bytes extra data on "
+			  "unprivileged socket\n", (int)req->extra_len));
+		return -1;
 	}
 
-	subreq->async.fn = wb_req_read_main;
-	subreq->async.priv = req;
+	return req->extra_len;
 }
 
-static void wb_req_read_main(struct async_req *subreq)
+static void wb_req_read_done(struct tevent_req *subreq)
 {
 	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
+		subreq->async.private_data, struct async_req);
 	struct req_read_state *state = talloc_get_type_abort(
 		req->private_data, struct req_read_state);
 	int err;
 	ssize_t ret;
+	uint8_t *buf;
 
-	ret = recvall_recv(subreq, &err);
+	ret = read_packet_recv(subreq, state, &buf, &err);
 	TALLOC_FREE(subreq);
-	if (ret < 0) {
+	if (ret == -1) {
 		async_req_error(req, map_wbc_err_from_errno(err));
 		return;
 	}
 
-	if ((state->max_extra_data != 0)
-	    && (state->wb_req->extra_len > state->max_extra_data)) {
-		DEBUG(3, ("Got request with %d bytes extra data on "
-			  "unprivileged socket\n",
-			  (int)state->wb_req->extra_len));
-		async_req_error(req, WBC_ERR_INVALID_RESPONSE);
-		return;
-	}
-
-	if (state->wb_req->extra_len == 0) {
-		async_req_done(req);
-		return;
-	}
-
-	state->wb_req->extra_data.data = TALLOC_ARRAY(
-		state->wb_req, char, state->wb_req->extra_len + 1);
-	if (async_req_nomem(state->wb_req->extra_data.data, req)) {
-		return;
-	}
-
-	state->wb_req->extra_data.data[state->wb_req->extra_len] = 0;
-
-	subreq = recvall_send(
-		req, state->ev, state->fd, state->wb_req->extra_data.data,
-		state->wb_req->extra_len, 0);
-	if (async_req_nomem(subreq, req)) {
-		return;
-	}
-
-	subreq->async.fn = wb_req_read_extra;
-	subreq->async.priv = req;
-}
-
-static void wb_req_read_extra(struct async_req *subreq)
-{
-	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
-	int err;
-	ssize_t ret;
+	state->wb_req = (struct winbindd_request *)buf;
 
-	ret = recvall_recv(subreq, &err);
-	TALLOC_FREE(subreq);
-	if (ret < 0) {
-		async_req_error(req, map_wbc_err_from_errno(err));
-		return;
+	if (state->wb_req->extra_len != 0) {
+		state->wb_req->extra_data.data =
+			(char *)buf + sizeof(struct winbindd_request);
+	} else {
+		state->wb_req->extra_data.data = NULL;
 	}
 	async_req_done(req);
 }
 
-
 wbcErr wb_req_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
 			struct winbindd_request **preq)
 {
@@ -237,90 +181,60 @@ wbcErr wb_req_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
 }
 
 struct req_write_state {
-	struct winbindd_request *wb_req;
-	struct tevent_context *ev;
-	int fd;
+	struct iovec iov[2];
 };
 
-static void wb_req_write_main(struct async_req *subreq);
-static void wb_req_write_extra(struct async_req *subreq);
+static void wb_req_write_done(struct tevent_req *subreq);
 
 struct async_req *wb_req_write_send(TALLOC_CTX *mem_ctx,
 				    struct tevent_context *ev, int fd,
 				    struct winbindd_request *wb_req)
 {
-	struct async_req *result, *subreq;
+	struct async_req *result;
+	struct tevent_req *subreq;
 	struct req_write_state *state;
+	int count = 1;
 
 	if (!async_req_setup(mem_ctx, &result, &state,
 			     struct req_write_state)) {
 		return NULL;
 	}
-	state->fd = fd;
-	state->ev = ev;
-	state->wb_req = wb_req;
 
-	subreq = sendall_send(state, state->ev, state->fd, state->wb_req,
-			      sizeof(struct winbindd_request), 0);
-	if (subreq == NULL) {
-		goto nomem;
+	state->iov[0].iov_base = wb_req;
+	state->iov[0].iov_len = sizeof(struct winbindd_request);
+
+	if (wb_req->extra_len != 0) {
+		state->iov[1].iov_base = wb_req->extra_data.data;
+		state->iov[1].iov_len = wb_req->extra_len;
+		count = 2;
 	}
 
-	subreq->async.fn = wb_req_write_main;
-	subreq->async.priv = result;
+	subreq = writev_send(state, ev, fd, state->iov, count);
+	if (subreq == NULL) {
+		goto fail;
+	}
+	subreq->async.fn = wb_req_write_done;
+	subreq->async.private_data = result;
 	return result;
 
- nomem:
+ fail:
 	TALLOC_FREE(result);
 	return NULL;
 }
 
-static void wb_req_write_main(struct async_req *subreq)
-{
-	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
-	struct req_write_state *state = talloc_get_type_abort(
-		req->private_data, struct req_write_state);
-	int err;
-	ssize_t ret;
-
-	ret = sendall_recv(subreq, &err);
-	TALLOC_FREE(subreq);
-	if (ret < 0) {
-		async_req_error(req, map_wbc_err_from_errno(err));
-		return;
-	}
-
-	if (state->wb_req->extra_len == 0) {
-		async_req_done(req);
-		return;
-	}
-
-	subreq = sendall_send(state, state->ev, state->fd,
-			      state->wb_req->extra_data.data,
-			      state->wb_req->extra_len, 0);
-	if (async_req_nomem(subreq, req)) {
-		return;
-	}
-
-	subreq->async.fn = wb_req_write_extra;
-	subreq->async.priv = req;
-}
-
-static void wb_req_write_extra(struct async_req *subreq)
+static void wb_req_write_done(struct tevent_req *subreq)
 {
 	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
+		subreq->async.private_data, struct async_req);
 	int err;
 	ssize_t ret;
 
-	ret = sendall_recv(subreq, &err);
+	ret = writev_recv(subreq, &err);
 	TALLOC_FREE(subreq);
 	if (ret < 0) {
 		async_req_error(req, map_wbc_err_from_errno(err));
 		return;
 	}
-
 	async_req_done(req);
 }
 
@@ -331,40 +245,29 @@ wbcErr wb_req_write_recv(struct async_req *req)
 
 struct resp_read_state {
 	struct winbindd_response *wb_resp;
-	struct tevent_context *ev;
-	size_t max_extra_data;
-	int fd;
 };
 
-static void wb_resp_read_len(struct async_req *subreq);
-static void wb_resp_read_main(struct async_req *subreq);
-static void wb_resp_read_extra(struct async_req *subreq);
+static ssize_t wb_resp_more(uint8_t *buf, size_t buflen, void *private_data);
+static void wb_resp_read_done(struct tevent_req *subreq);
 
 struct async_req *wb_resp_read_send(TALLOC_CTX *mem_ctx,
 				    struct tevent_context *ev, int fd)
 {
-	struct async_req *result, *subreq;
+	struct async_req *result;
+	struct tevent_req *subreq;
 	struct resp_read_state *state;
 
 	if (!async_req_setup(mem_ctx, &result, &state,
 			     struct resp_read_state)) {
 		return NULL;
 	}
-	state->fd = fd;
-	state->ev = ev;
-	state->wb_resp = talloc(state, struct winbindd_response);
-	if (state->wb_resp == NULL) {
-		goto nomem;
-	}
 
-	subreq = recvall_send(state, ev, state->fd, &(state->wb_resp->length),
-			      sizeof(state->wb_resp->length), 0);
+	subreq = read_packet_send(state, ev, fd, 4, wb_resp_more, state);
 	if (subreq == NULL) {
 		goto nomem;
 	}
-
-	subreq->async.fn = wb_resp_read_len;
-	subreq->async.priv = result;
+	subreq->async.fn = wb_resp_read_done;
+	subreq->async.private_data = result;
 	return result;
 
  nomem:
@@ -372,100 +275,50 @@ struct async_req *wb_resp_read_send(TALLOC_CTX *mem_ctx,
 	return NULL;
 }
 
-static void wb_resp_read_len(struct async_req *subreq)
+static ssize_t wb_resp_more(uint8_t *buf, size_t buflen, void *private_data)
 {
-	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
-	struct resp_read_state *state = talloc_get_type_abort(
-		req->private_data, struct resp_read_state);
-	int err;
-	ssize_t ret;
-
-	ret = recvall_recv(subreq, &err);
-	TALLOC_FREE(subreq);
-	if (ret < 0) {
-		async_req_error(req, map_wbc_err_from_errno(err));
-		return;
-	}
-
-	if (state->wb_resp->length < sizeof(struct winbindd_response)) {
-		DEBUG(0, ("wb_resp_read_len: Invalid response size received: "
-			  "%d (expected at least%d)\n",
-			  (int)state->wb_resp->length,
-			  (int)sizeof(struct winbindd_response)));
-		async_req_error(req, WBC_ERR_INVALID_RESPONSE);
-		return;
-	}
-
-	subreq = recvall_send(
-		req, state->ev, state->fd, (uint32 *)(state->wb_resp)+1,
-		sizeof(struct winbindd_response) - sizeof(uint32), 0);
-	if (async_req_nomem(subreq, req)) {
-		return;
-	}
-
-	subreq->async.fn = wb_resp_read_main;
-	subreq->async.priv = req;
+	struct winbindd_response *resp = (struct winbindd_response *)buf;
+
+	if (buflen == 4) {
+		if (resp->length < sizeof(struct winbindd_response)) {
+			DEBUG(0, ("wb_resp_read_len: Invalid response size "
+				  "received: %d (expected at least%d)\n",
+				  (int)resp->length,
+				  (int)sizeof(struct winbindd_response)));
+			return -1;
+		}
+	}
+	return resp->length - 4;
 }
 
-static void wb_resp_read_main(struct async_req *subreq)
+static void wb_resp_read_done(struct tevent_req *subreq)
 {
 	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
+		subreq->async.private_data, struct async_req);
 	struct resp_read_state *state = talloc_get_type_abort(
 		req->private_data, struct resp_read_state);
+	uint8_t *buf;
 	int err;
 	ssize_t ret;
-	size_t extra_len;
 
-	ret = recvall_recv(subreq, &err);
+	ret = read_packet_recv(subreq, state, &buf, &err);
 	TALLOC_FREE(subreq);
-	if (ret < 0) {
+	if (ret == -1) {
 		async_req_error(req, map_wbc_err_from_errno(err));
 		return;
 	}
 
-	extra_len = state->wb_resp->length - sizeof(struct winbindd_response);
-	if (extra_len == 0) {
-		async_req_done(req);
-		return;
-	}
-
-	state->wb_resp->extra_data.data = TALLOC_ARRAY(
-		state->wb_resp, char, extra_len+1);
-	if (async_req_nomem(state->wb_resp->extra_data.data, req)) {
-		return;
-	}
-	((char *)state->wb_resp->extra_data.data)[extra_len] = 0;
-
-	subreq = recvall_send(
-		req, state->ev, state->fd, state->wb_resp->extra_data.data,
-		extra_len, 0);
-	if (async_req_nomem(subreq, req)) {
-		return;
-	}
-
-	subreq->async.fn = wb_resp_read_extra;
-	subreq->async.priv = req;
-}
-
-static void wb_resp_read_extra(struct async_req *subreq)
-{
-	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
-	int err;
-	ssize_t ret;
+	state->wb_resp = (struct winbindd_response *)buf;
 
-	ret = recvall_recv(subreq, &err);
-	TALLOC_FREE(subreq);
-	if (ret < 0) {
-		async_req_error(req, map_wbc_err_from_errno(err));
-		return;
+	if (state->wb_resp->length > sizeof(struct winbindd_response)) {
+		state->wb_resp->extra_data.data =
+			(char *)buf + sizeof(struct winbindd_response);
+	} else {
+		state->wb_resp->extra_data.data = NULL;
 	}
 	async_req_done(req);
 }
 
-
 wbcErr wb_resp_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
 			 struct winbindd_response **presp)
 {
@@ -481,91 +334,61 @@ wbcErr wb_resp_read_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
 }
 
 struct resp_write_state {
-	struct winbindd_response *wb_resp;
-	struct tevent_context *ev;
-	int fd;
+	struct iovec iov[2];
 };
 
-static void wb_resp_write_main(struct async_req *subreq);
-static void wb_resp_write_extra(struct async_req *subreq);
+static void wb_resp_write_done(struct tevent_req *subreq);
 
 struct async_req *wb_resp_write_send(TALLOC_CTX *mem_ctx,
 				    struct tevent_context *ev, int fd,
 				    struct winbindd_response *wb_resp)
 {
-	struct async_req *result, *subreq;
+	struct async_req *result;
+	struct tevent_req *subreq;
 	struct resp_write_state *state;
+	int count = 1;
 
 	if (!async_req_setup(mem_ctx, &result, &state,
 			     struct resp_write_state)) {
 		return NULL;
 	}
-	state->fd = fd;
-	state->ev = ev;
-	state->wb_resp = wb_resp;
 
-	subreq = sendall_send(state, state->ev, state->fd, state->wb_resp,
-			      sizeof(struct winbindd_response), 0);
-	if (subreq == NULL) {
-		goto nomem;
+	state->iov[0].iov_base = wb_resp;
+	state->iov[0].iov_len = sizeof(struct winbindd_response);
+
+	if (wb_resp->length > sizeof(struct winbindd_response)) {
+		state->iov[1].iov_base = wb_resp->extra_data.data;
+		state->iov[1].iov_len =
+			wb_resp->length - sizeof(struct winbindd_response);
+		count = 2;
 	}
 
-	subreq->async.fn = wb_resp_write_main;
-	subreq->async.priv = result;
+	subreq = writev_send(state, ev, fd, state->iov, count);
+	if (subreq == NULL) {
+		goto fail;
+	}
+	subreq->async.fn = wb_resp_write_done;
+	subreq->async.private_data = result;
 	return result;
 
- nomem:
+ fail:
 	TALLOC_FREE(result);
 	return NULL;
 }
 
-static void wb_resp_write_main(struct async_req *subreq)
+static void wb_resp_write_done(struct tevent_req *subreq)
 {
 	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
-	struct resp_write_state *state = talloc_get_type_abort(
-		req->private_data, struct resp_write_state);
+		subreq->async.private_data, struct async_req);
 	int err;
 	ssize_t ret;
 
-	ret = sendall_recv(subreq, &err);
+	ret = writev_recv(subreq, &err);
 	TALLOC_FREE(subreq);
 	if (ret < 0) {
 		async_req_error(req, map_wbc_err_from_errno(err));
 		return;
 	}
-
-	if (state->wb_resp->length == sizeof(struct winbindd_response)) {
-		async_req_done(req);
-		return;
-	}
-
-	subreq = sendall_send(
-		state, state->ev, state->fd,
-		state->wb_resp->extra_data.data,
-		state->wb_resp->length - sizeof(struct winbindd_response), 0);
-	if (async_req_nomem(subreq, req)) {
-		return;
-	}
-
-	subreq->async.fn = wb_resp_write_extra;
-	subreq->async.priv = req;
-}
-
-static void wb_resp_write_extra(struct async_req *subreq)
-{
-	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
-	int err;
-	ssize_t ret;
-
-	ret = sendall_recv(subreq, &err);
-	TALLOC_FREE(subreq);
-	if (err < 0) {
-		async_req_error(req, map_wbc_err_from_errno(err));
-		return;
-	}
-
 	async_req_done(req);
 }
 
diff --git a/source3/lib/wbclient.c b/source3/lib/wbclient.c
index 4d3a609530..b8d55a944a 100644
--- a/source3/lib/wbclient.c
+++ b/source3/lib/wbclient.c
@@ -147,17 +147,30 @@ struct wb_context *wb_context_init(TALLOC_CTX *mem_ctx)
 	return result;
 }
 
+struct wb_connect_state {
+	int dummy;
+};
+
+static void wbc_connect_connected(struct tevent_req *subreq);
+
 static struct async_req *wb_connect_send(TALLOC_CTX *mem_ctx,
-					 struct tevent_context *ev,
-					 struct wb_context *wb_ctx,
-					 const char *dir)
+					  struct tevent_context *ev,
+					  struct wb_context *wb_ctx,
+					  const char *dir)
 {
-	struct async_req *req;
+	struct async_req *result;
+	struct tevent_req *subreq;
+	struct wb_connect_state *state;
 	struct sockaddr_un sunaddr;
 	struct stat st;
 	char *path = NULL;
 	wbcErr wbc_err;
 
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct wb_connect_state)) {
+		return NULL;
+	}
+
 	if (wb_ctx->fd != -1) {
 		close(wb_ctx->fd);
 		wb_ctx->fd = -1;
@@ -205,33 +218,46 @@ static struct async_req *wb_connect_send(TALLOC_CTX *mem_ctx,
 		goto post_status;
 	}
 
-	req = async_connect_send(mem_ctx, ev, wb_ctx->fd,
-				 (struct sockaddr *)&sunaddr,
-				 sizeof(sunaddr));
-	if (req == NULL) {
+	subreq = async_connect_send(mem_ctx, ev, wb_ctx->fd,
+				    (struct sockaddr *)&sunaddr,
+				    sizeof(sunaddr));
+	if (subreq == NULL) {
 		goto nomem;
 	}
-	if (!async_req_set_timeout(req, ev, timeval_set(30, 0))) {
-		TALLOC_FREE(req);
+	subreq->async.fn = wbc_connect_connected;
+	subreq->async.private_data = result;
+
+	if (!tevent_req_set_endtime(subreq, ev, timeval_current_ofs(30, 0))) {
 		goto nomem;
 	}
 
-	return req;
+	return result;
 
  nomem:
 	wbc_err = WBC_ERR_NO_MEMORY;
  post_status:
-	req = async_req_new(mem_ctx);
-	if (req == NULL) {
-		return NULL;
-	}
-	if (async_post_error(req, ev, wbc_err)) {
-		return req;
+	if (async_post_error(result, ev, wbc_err)) {
+		return result;
 	}
-	TALLOC_FREE(req);
+	TALLOC_FREE(result);
 	return NULL;
 }
 
+static void wbc_connect_connected(struct tevent_req *subreq)
+{
+	struct async_req *req = talloc_get_type_abort(
+		subreq->async.private_data, struct async_req);
+	int res, err;
+
+	res = async_connect_recv(subreq, &err);
+	TALLOC_FREE(subreq);
+	if (res == -1) {
+		async_req_error(req, map_wbc_err_from_errno(err));
+		return;
+	}
+	async_req_done(req);
+}
+
 static wbcErr wb_connect_recv(struct async_req *req)
 {
 	return async_req_simple_recv_wbcerr(req);
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index dabfc398ce..ad11ee0ed4 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1642,6 +1642,7 @@ bool cli_session_request(struct cli_state *cli,
 {
 	char *p;
 	int len = 4;
+	char *tmp;
 
 	/* 445 doesn't have session request */
 	if (cli->port == 445)
@@ -1651,14 +1652,30 @@ bool cli_session_request(struct cli_state *cli,
 	memcpy(&(cli->called ), called , sizeof(*called ));
 
 	/* put in the destination name */
+
+	tmp = name_mangle(talloc_tos(), cli->called.name,
+			  cli->called.name_type);
+	if (tmp == NULL) {
+		return false;
+	}
+
 	p = cli->outbuf+len;
-	name_mangle(cli->called .name, p, cli->called .name_type);
-	len += name_len(p);
+	memcpy(p, tmp, name_len(tmp));
+	len += name_len(tmp);
+	TALLOC_FREE(tmp);
 
 	/* and my name */
+
+	tmp = name_mangle(talloc_tos(), cli->calling.name,
+			  cli->calling.name_type);
+	if (tmp == NULL) {
+		return false;
+	}
+
 	p = cli->outbuf+len;
-	name_mangle(cli->calling.name, p, cli->calling.name_type);
-	len += name_len(p);
+	memcpy(p, tmp, name_len(tmp));
+	len += name_len(tmp);
+	TALLOC_FREE(tmp);
 
 	/* send a session request (RFC 1002) */
 	/* setup the packet length
diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c
index 02b13ae63e..5f3eda44fe 100644
--- a/source3/libsmb/nmblib.c
+++ b/source3/libsmb/nmblib.c
@@ -1279,12 +1279,19 @@ static int name_interpret(char *in, fstring name)
  Note:  <Out> must be (33 + strlen(scope) + 2) bytes long, at minimum.
 ****************************************************************************/
 
-int name_mangle( char *In, char *Out, char name_type )
+char *name_mangle(TALLOC_CTX *mem_ctx, char *In, char name_type)
 {
 	int   i;
 	int   len;
 	nstring buf;
-	char *p = Out;
+	char *result;
+	char *p;
+
+	result = talloc_array(mem_ctx, char, 33 + strlen(global_scope()) + 2);
+	if (result == NULL) {
+		return NULL;
+	}
+	p = result;
 
 	/* Safely copy the input string, In, into buf[]. */
 	if (strcmp(In,"*") == 0)
@@ -1321,7 +1328,7 @@ int name_mangle( char *In, char *Out, char name_type )
 				p[0] = len;
 				if( len > 0 )
 					p[len+1] = 0;
-				return( name_len(Out) );
+				return result;
 			case '.':
 				p[0] = len;
 				p   += (len + 1);
@@ -1333,7 +1340,7 @@ int name_mangle( char *In, char *Out, char name_type )
 		}
 	}
 
-	return( name_len(Out) );
+	return result;
 }
 
 /****************************************************************************
diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index 6dead2d264..33e89c8acb 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -1171,13 +1171,12 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
 struct np_write_state {
 	struct event_context *ev;
 	struct np_proxy_state *p;
-	const uint8_t *data;
-	size_t len;
+	struct iovec iov;
 	ssize_t nwritten;
 };
 
 static void np_write_trigger(struct async_req *req);
-static void np_write_done(struct async_req *subreq);
+static void np_write_done(struct tevent_req *subreq);
 
 struct async_req *np_write_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
 				struct fake_file_handle *handle,
@@ -1218,8 +1217,8 @@ struct async_req *np_write_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
 
 		state->ev = ev;
 		state->p = p;
-		state->data = data;
-		state->len = len;
+		state->iov.iov_base = CONST_DISCARD(void *, data);
+		state->iov.iov_len = len;
 
 		if (!async_req_enqueue(p->write_queue, ev, result,
 				       np_write_trigger)) {
@@ -1242,27 +1241,26 @@ static void np_write_trigger(struct async_req *req)
 {
 	struct np_write_state *state = talloc_get_type_abort(
 		req->private_data, struct np_write_state);
-	struct async_req *subreq;
+	struct tevent_req *subreq;
 
-	subreq = sendall_send(state, state->ev, state->p->fd, state->data,
-			      state->len, 0);
+	subreq = writev_send(state, state->ev, state->p->fd, &state->iov, 1);
 	if (async_req_nomem(subreq, req)) {
 		return;
 	}
 	subreq->async.fn = np_write_done;
-	subreq->async.priv = req;
+	subreq->async.private_data = req;
 }
 
-static void np_write_done(struct async_req *subreq)
+static void np_write_done(struct tevent_req *subreq)
 {
 	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
+		subreq->async.private_data, struct async_req);
 	struct np_write_state *state = talloc_get_type_abort(
 		req->private_data, struct np_write_state);
 	ssize_t received;
 	int err;
 
-	received = sendall_recv(subreq, &err);
+	received = writev_recv(subreq, &err);
 	if (received < 0) {
 		async_req_nterror(req, map_nt_error_from_unix(err));
 		return;
@@ -1316,7 +1314,7 @@ struct np_read_state {
 };
 
 static void np_read_trigger(struct async_req *req);
-static void np_read_done(struct async_req *subreq);
+static void np_read_done(struct tevent_req *subreq);
 
 struct async_req *np_read_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
 			       struct fake_file_handle *handle,
@@ -1393,28 +1391,28 @@ static void np_read_trigger(struct async_req *req)
 {
 	struct np_read_state *state = talloc_get_type_abort(
 		req->private_data, struct np_read_state);
-	struct async_req *subreq;
+	struct tevent_req *subreq;
 
-	subreq = read_pkt_send(state, state->ev, state->p->fd, RPC_HEADER_LEN,
-			       rpc_frag_more_fn, NULL);
+	subreq = read_packet_send(state, state->ev, state->p->fd,
+				  RPC_HEADER_LEN, rpc_frag_more_fn, NULL);
 	if (async_req_nomem(subreq, req)) {
 		return;
 	}
 	subreq->async.fn = np_read_done;
-	subreq->async.priv = req;
+	subreq->async.private_data = req;
 }
 
-static void np_read_done(struct async_req *subreq)
+static void np_read_done(struct tevent_req *subreq)
 {
 	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
+		subreq->async.private_data, struct async_req);
 	struct np_read_state *state = talloc_get_type_abort(
 		req->private_data, struct np_read_state);
 	ssize_t received;
 	size_t thistime;
 	int err;
 
-	received = read_pkt_recv(subreq, state->p, &state->p->msg, &err);
+	received = read_packet_recv(subreq, state->p, &state->p->msg, &err);
 	TALLOC_FREE(subreq);
 	if (received == -1) {
 		async_req_nterror(req, map_nt_error_from_unix(err));
diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index 1fdea818d6..39a264011e 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -91,8 +91,15 @@ static void filter_request(char *buf)
 			d_printf("sesion_request: %s -> %s\n",
 				 name1, name2);
 			if (netbiosname) {
-				/* replace the destination netbios name */
-				name_mangle(netbiosname, buf+4, 0x20);
+				char *mangled = name_mangle(
+					talloc_tos(), netbiosname, 0x20);
+				if (mangled != NULL) {
+					/* replace the destination netbios
+					 * name */
+					memcpy(buf+4, mangled,
+					       name_len(mangled));
+					TALLOC_FREE(mangled);
+				}
 			}
 		}
 		return;