summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-03-13 02:47:21 +0000
committerJeremy Allison <jra@samba.org>2004-03-13 02:47:21 +0000
commita0034d3586dadfddc18e4a3096564bf158d43e4e (patch)
tree9a1990510fe60ead11dc77fe622da05c3f45b19c /source3/lib
parent6b9dbbcd249360fb9acd61d6900baccf621c9cce (diff)
downloadsamba-a0034d3586dadfddc18e4a3096564bf158d43e4e.tar.gz
samba-a0034d3586dadfddc18e4a3096564bf158d43e4e.tar.bz2
samba-a0034d3586dadfddc18e4a3096564bf158d43e4e.zip
Ensure we don't truncate strcmps to nstring anymore...
Jeremy. (This used to be commit d7cf64b1e4e501bcd01ddc8279babc65d894a4b3)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/charcnv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 28ecf761d3..20af806d90 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -833,6 +833,7 @@ size_t push_ascii_nstring(void *dest, const char *src)
size_t i, buffer_len, dest_len;
smb_ucs2_t *buffer;
+ conv_silent = True;
buffer_len = push_ucs2_allocate(&buffer, src);
if (buffer_len == (size_t)-1) {
smb_panic("failed to create UCS2 buffer");
@@ -854,6 +855,7 @@ size_t push_ascii_nstring(void *dest, const char *src)
((char *)dest)[dest_len] = '\0';
SAFE_FREE(buffer);
+ conv_silent = False;
return dest_len;
}