summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-04-10 18:21:16 +0000
committerJeremy Allison <jra@samba.org>1998-04-10 18:21:16 +0000
commite300c0346ff92035ff9568b55b34469193e29769 (patch)
treef4d6a8527410556a158c548f091011885016d9dc /source3/lib
parent31ae9c7013be791717f6e77794ce8c8fc1c1c16c (diff)
downloadsamba-e300c0346ff92035ff9568b55b34469193e29769.tar.gz
samba-e300c0346ff92035ff9568b55b34469193e29769.tar.bz2
samba-e300c0346ff92035ff9568b55b34469193e29769.zip
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)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/membuffer.c4
1 files changed, 2 insertions, 2 deletions
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"));
}