merge from APPLIANCE_HEAD

(This used to be commit e734c1971d2841b2cfe37414fe4893f4a66b22a9)

diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index 07dc2210c1988d6662765171eb360da784640148..44dd5fac656b64ea0ff86b255ed0bb7e93e66324 100644 (file)
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -579,7 +579,7 @@ authentication failed. Denying the request.\n", p->name));
         * will not fit in the initial buffer of size 0x1068   --jerry 22/01/2002
         */
        
-       if(prs_data_size(&p->in_data.data) + data_len > 15*1024*1024) {
+       if(prs_offset(&p->in_data.data) + data_len > 15*1024*1024) {
                DEBUG(0,("process_request_pdu: rpc data buffer too large (%u) + (%u)\n",
                                (unsigned int)prs_data_size(&p->in_data.data), (unsigned int)data_len ));
                set_incoming_fault(p);