summaryrefslogtreecommitdiff
path: root/source3/lib
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/lib
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/lib')
-rw-r--r--source3/lib/charcnv.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 30941dd7e8..349fbff850 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -1504,7 +1504,10 @@ size_t pull_ascii_talloc(TALLOC_CTX *ctx, char **dest, const char *src)
is -1 then no maxiumum is used.
**/
-size_t push_string_fn(const char *function, unsigned int line, const void *base_ptr, void *dest, const char *src, size_t dest_len, int flags)
+size_t push_string_fn(const char *function, unsigned int line,
+ const void *base_ptr, uint16 flags2,
+ void *dest, const char *src,
+ size_t dest_len, int flags)
{
#ifdef DEVELOPER
/* We really need to zero fill here, not clobber
@@ -1524,7 +1527,7 @@ size_t push_string_fn(const char *function, unsigned int line, const void *base_
if (!(flags & STR_ASCII) && \
((flags & STR_UNICODE || \
- (SVAL(base_ptr, smb_flg2) & FLAGS2_UNICODE_STRINGS)))) {
+ (flags2 & FLAGS2_UNICODE_STRINGS)))) {
return push_ucs2(base_ptr, dest, src, dest_len, flags);
}
return push_ascii(dest, src, dest_len, flags);