From e300c0346ff92035ff9568b55b34469193e29769 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 10 Apr 1998 18:21:16 +0000 Subject: includes.h: Moved HPUX undefine of SEMMSL to where it actually does something. ipc.c: Added Luke's debug statement. locking_slow.c: Added FTRUNCATE_NEEDS_ROOT code for broken systems that need it (not sure what these are yet). membuffer.c ntdomain.h proto.h lib/rpc/include/rpc_dce.h lib/rpc/include/rpc_srvsvc.h lib/rpc/parse/parse_prs.c lib/rpc/parse/parse_rpc.c lib/rpc/server/srv_pipe_hnd.c lib/rpc/server/srv_util.c: Re-merge of Luke's NTDOM changes 'cos he's a lazy git with carpel tunnel syndrome :-). Jeremy. (This used to be commit 52e3966fbcf7b5fbdbc7cbe9ac0b453ab5bf3217) --- source3/lib/membuffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/lib/membuffer.c') diff --git a/source3/lib/membuffer.c b/source3/lib/membuffer.c index cf832c13cc..90b07047d3 100644 --- a/source3/lib/membuffer.c +++ b/source3/lib/membuffer.c @@ -293,11 +293,11 @@ BOOL mem_realloc_data(struct mem_buf *buf, int new_size) /******************************************************************* reallocate a memory buffer, retrospectively :-) ********************************************************************/ -BOOL mem_grow_data(struct mem_buf **buf, BOOL io, int new_size) +BOOL mem_grow_data(struct mem_buf **buf, BOOL io, int new_size, BOOL force_grow) { if (new_size + (*buf)->margin >= (*buf)->data_size) { - if (io) + if (io && !force_grow) { DEBUG(3,("mem_grow_data: cannot resize when reading from a data stream\n")); } -- cgit