Changeset 989 for vendor/current/source4/librpc

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/source4/librpc/rpc

Files:

• dcerpc.c (modified) (4 diffs)
• dcerpc.h (modified) (1 diff)

vendor/current/source4/librpc/rpc/dcerpc.c

@@ -156 +156 @@
         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;
 
@@ -1415 +1416 @@
         /* the bind_ack might contain a reply set of credentials */
         if (pkt->auth_length != 0 && sec->tmp_auth_info.in != NULL) {
-                uint32_t auth_length;
-
                 status = dcerpc_pull_auth_trailer(pkt, sec->tmp_auth_info.mem,
                                                   &pkt->u.bind_ack.auth_info,
                                                   sec->tmp_auth_info.in,
-                                                  &auth_length, true);
+                                                  NULL, true);
                 if (tevent_req_nterror(req, status)) {
                         return;
@@ -1578 +1577 @@
         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;
@@ -2435 +2434 @@
         /* the alter_resp might contain a reply set of credentials */
         if (pkt->auth_length != 0 && sec->tmp_auth_info.in != NULL) {
-                uint32_t auth_length;
-
                 status = dcerpc_pull_auth_trailer(pkt, sec->tmp_auth_info.mem,
                                                   &pkt->u.alter_resp.auth_info,
                                                   sec->tmp_auth_info.in,
-                                                  &auth_length, true);
+                                                  NULL, true);
                 if (tevent_req_nterror(req, status)) {
                         return;

vendor/current/source4/librpc/rpc/dcerpc.h

@@ -108 +108 @@
         /* 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;
 };