diff options
| author | Jeremy Allison <jra@samba.org> | 2004-03-13 02:47:19 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2004-03-13 02:47:19 +0000 |
| commit | 309c0a65b7de7311a5032d6a8e41c9eb039af2aa (patch) | |
| tree | 58d6944a70a1db7c5740512402fa97121dbced56 /source3/lib | |
| parent | 9a699d74efbcbbb8607c7dea2734d7acb3478896 (diff) | |
| download | samba-309c0a65b7de7311a5032d6a8e41c9eb039af2aa.tar.gz samba-309c0a65b7de7311a5032d6a8e41c9eb039af2aa.tar.bz2 samba-309c0a65b7de7311a5032d6a8e41c9eb039af2aa.zip | |
Ensure we don't truncate strcmps to nstring anymore...
Jeremy.
(This used to be commit b3aff7f214da97925690a5d0a887ea1b336d107a)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/charcnv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index d38bfdb534..c2213c966d 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; } |