Don't copy the winbindd_request in wb_trans

diff --git a/source3/include/wbc_async.h b/source3/include/wbc_async.h
index 5aac64d48ea80e78b133d53228a80d14adad381b..b5e769f8c3871ca0bb76ea61cfd388036e47bfd4 100644 (file)
--- a/source3/include/wbc_async.h
+++ b/source3/include/wbc_async.h
@@ -30,7 +30,7 @@ struct wb_context {
 
 struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
                                struct wb_context *wb_ctx, bool need_priv,
-                               const struct winbindd_request *wb_req);
+                               struct winbindd_request *wb_req);
 wbcErr wb_trans_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
                     struct winbindd_response **presponse);
 struct wb_context *wb_context_init(TALLOC_CTX *mem_ctx);

diff --git a/source3/lib/wbclient.c b/source3/lib/wbclient.c
index d1f3190c79c03cce72eb4ca0722de79dc5c38b88..80937641e62d78c2feaaba3c5b4763cbe7e2815f 100644 (file)
--- a/source3/lib/wbclient.c
+++ b/source3/lib/wbclient.c
@@ -259,31 +259,6 @@ static wbcErr wb_connect_recv(struct tevent_req *req)
        return tevent_req_simple_recv_wbcerr(req);
 }
 
-static struct winbindd_request *winbindd_request_copy(
-       TALLOC_CTX *mem_ctx,
-       const struct winbindd_request *req)
-{
-       struct winbindd_request *result;
-
-       result = (struct winbindd_request *)TALLOC_MEMDUP(
-               mem_ctx, req, sizeof(struct winbindd_request));
-       if (result == NULL) {
-               return NULL;
-       }
-
-       if (result->extra_len == 0) {
-               return result;
-       }
-
-       result->extra_data.data = (char *)TALLOC_MEMDUP(
-               result, result->extra_data.data, result->extra_len);
-       if (result->extra_data.data == NULL) {
-               TALLOC_FREE(result);
-               return NULL;
-       }
-       return result;
-}
-
 struct wb_int_trans_state {
        struct tevent_context *ev;
        int fd;
@@ -600,7 +575,7 @@ static void wb_trigger_trans(struct async_req *req)
 
 struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
                                struct wb_context *wb_ctx, bool need_priv,
-                               const struct winbindd_request *wb_req)
+                               struct winbindd_request *wb_req)
 {
        struct async_req *result;
        struct wb_trans_state *state;
@@ -611,10 +586,7 @@ struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
        }
        state->wb_ctx = wb_ctx;
        state->ev = ev;
-       state->wb_req = winbindd_request_copy(state, wb_req);
-       if (state->wb_req == NULL) {
-               goto fail;
-       }
+       state->wb_req = wb_req;
        state->num_retries = 10;
        state->need_priv = need_priv;