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

1 files changed, 8 insertions, 36 deletions

diff --git a/source3/lib/wb_reqtrans.c b/source3/lib/wb_reqtrans.c
index 1f5f181aa1..0e6e5d15c4 100644
--- a/source3/lib/wb_reqtrans.c
+++ b/source3/lib/wb_reqtrans.c
@@ -43,17 +43,10 @@ struct async_req *wb_req_read_send(TALLOC_CTX *mem_ctx,
 	struct async_req *result, *subreq;
 	struct req_read_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct req_read_state)) {
 		return NULL;
 	}
-
-	state = talloc(result, struct req_read_state);
-	if (state == NULL) {
-		goto nomem;
-	}
-	result->private_data = state;
-
 	state->fd = fd;
 	state->ev = ev;
 	state->max_extra_data = max_extra_data;
@@ -205,17 +198,10 @@ struct async_req *wb_req_write_send(TALLOC_CTX *mem_ctx,
 	struct async_req *result, *subreq;
 	struct req_write_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct req_write_state)) {
 		return NULL;
 	}
-
-	state = talloc(result, struct req_write_state);
-	if (state == NULL) {
-		goto nomem;
-	}
-	result->private_data = state;
-
 	state->fd = fd;
 	state->ev = ev;
 	state->wb_req = wb_req;
@@ -304,17 +290,10 @@ struct async_req *wb_resp_read_send(TALLOC_CTX *mem_ctx,
 	struct async_req *result, *subreq;
 	struct resp_read_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct resp_read_state)) {
 		return NULL;
 	}
-
-	state = talloc(result, struct resp_read_state);
-	if (state == NULL) {
-		goto nomem;
-	}
-	result->private_data = state;
-
 	state->fd = fd;
 	state->ev = ev;
 	state->wb_resp = talloc(state, struct winbindd_response);
@@ -458,17 +437,10 @@ struct async_req *wb_resp_write_send(TALLOC_CTX *mem_ctx,
 	struct async_req *result, *subreq;
 	struct resp_write_state *state;
 
-	result = async_req_new(mem_ctx);
-	if (result == NULL) {
+	if (!async_req_setup(mem_ctx, &result, &state,
+			     struct resp_write_state)) {
 		return NULL;
 	}
-
-	state = talloc(result, struct resp_write_state);
-	if (state == NULL) {
-		goto nomem;
-	}
-	result->private_data = state;
-
 	state->fd = fd;
 	state->ev = ev;
 	state->wb_resp = wb_resp;