s4:librpc/rpc: allow a total reassembled response payload of 240 MBytes

This will replace DCERPC_NCACN_PAYLOAD_MAX_SIZE (4 MByte),
The limit of DCERPC_NCACN_PAYLOAD_MAX_SIZE (4 MByte) was too
strict for some workloads, e.g. DRSUAPI replication with large objects.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11948

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 7413e73c5331b760dc84b3843059230ec5fcfc7b)

diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 827499155f8d8449fda59cc70d933091f6b06689..4225e1d1157df83df98f531bc80a65bb08f9621f 100644 (file)
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -155,6 +155,7 @@ static struct dcecli_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx,
         */
        c->srv_max_xmit_frag = 5840;
        c->srv_max_recv_frag = 5840;
+       c->max_total_response_size = DCERPC_NCACN_RESPONSE_DEFAULT_MAX_SIZE;
        c->pending = NULL;
 
        c->io_trigger = tevent_create_immediate(c);
@@ -1575,10 +1576,10 @@ static void dcerpc_request_recv_data(struct dcecli_connection *c,
 
        length = pkt->u.response.stub_and_verifier.length;
 
-       if (req->payload.length + length > DCERPC_NCACN_PAYLOAD_MAX_SIZE) {
+       if (req->payload.length + length > c->max_total_response_size) {
                DEBUG(2,("Unexpected total payload 0x%X > 0x%X dcerpc response\n",
                         (unsigned)req->payload.length + length,
-                        DCERPC_NCACN_PAYLOAD_MAX_SIZE));
+                        (unsigned)c->max_total_response_size));
                dcerpc_connection_dead(c, NT_STATUS_RPC_PROTOCOL_ERROR);
                return;
        }

diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index 1b0eb7d9ba17e44e357b30eefb5e9eae283611a6..0c5a819f5dcc15c1ba27c19c264351974288b21d 100644 (file)
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -107,6 +107,9 @@ struct dcecli_connection {
 
        /* the next context_id to be assigned */
        uint32_t next_context_id;
+
+       /* The maximum total payload of reassembled response pdus */
+       size_t max_total_response_size;
 };
 
 /*