diff options
| author | Stefan Metzmacher <metze@samba.org> | 2016-06-22 17:18:28 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2016-07-04 09:09:51 +0200 |
| commit | d069b66aa91eec039638fff789a7e9d431e7877f (patch) | |
| tree | 26489cdb37ac34e7d9bb540a8e32844e81eb138b | |
| parent | 65096890c7b2c4f8a28ac7548f253f04286f84f4 (diff) | |
| download | samba-d069b66aa91eec039638fff789a7e9d431e7877f.tar.gz | |
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)
| -rw-r--r-- | source4/librpc/rpc/dcerpc.c | 5 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 827499155f8..4225e1d1157 100644 --- 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 1b0eb7d9ba1..0c5a819f5dc 100644 --- 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; }; /* |