summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-08-02 18:06:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:29:10 -0500
commitb62bd05b93e2317f78a4aea089295cf1162d23e2 (patch)
treeef9fdbcdbeb0cd1ac67cbec4c69377d59b5d8452 /source3/smbd
parentcc8d70036477f30c6c9c8a6e37d1e2680107c0a6 (diff)
downloadsamba-b62bd05b93e2317f78a4aea089295cf1162d23e2.tar.gz
samba-b62bd05b93e2317f78a4aea089295cf1162d23e2.tar.bz2
samba-b62bd05b93e2317f78a4aea089295cf1162d23e2.zip
r24133: Explicitly pass flags2 down to push_string_fn
This needs a bit closer review, it also touches the client libs (This used to be commit 824eb26738d64af1798d319d339582cf047521f0)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/srvstr.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/smbd/srvstr.c b/source3/smbd/srvstr.c
index df993537ba..fbcf249ffb 100644
--- a/source3/smbd/srvstr.c
+++ b/source3/smbd/srvstr.c
@@ -33,13 +33,17 @@ size_t srvstr_push_fn(const char *function, unsigned int line,
#if 0
DEBUG(0, ("Pushing string of 'unlimited' length into non-SMB buffer!\n"));
#endif
- return push_string_fn(function, line, base_ptr, dest, src, -1, flags);
+ return push_string_fn(function, line, base_ptr,
+ smb_flags2, dest, src, -1,
+ flags);
}
- return push_string_fn(function, line, base_ptr, dest, src, max_send - buf_used, flags);
+ return push_string_fn(function, line, base_ptr, smb_flags2,
+ dest, src, max_send - buf_used, flags);
}
/* 'normal' push into size-specified buffer */
- return push_string_fn(function, line, base_ptr, dest, src, dest_len, flags);
+ return push_string_fn(function, line, base_ptr, smb_flags2, dest, src,
+ dest_len, flags);
}
/*******************************************************************