From 8e46bff8b88103f4a5b0d3920ab6e3901decaf22 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 31 Oct 2010 02:04:25 +0200 Subject: [PATCH] s3:librpc/ndr: use new strlen_m_ext_term() in ndr_charset_length(): fix bug #7594 This fixes the calculation of needed space for destination unicode charset. The last 4 patches address bug #7594 ("wbinfo -u" and "wbinfo -g" gives no output (log=>ndr_pull_error)). --- source3/librpc/ndr/ndr_string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source3/librpc/ndr/ndr_string.c b/source3/librpc/ndr/ndr_string.c index 51b0d89b127..f0c3e47a19a 100644 --- a/source3/librpc/ndr/ndr_string.c +++ b/source3/librpc/ndr/ndr_string.c @@ -719,11 +719,11 @@ _PUBLIC_ uint32_t ndr_charset_length(const void *var, charset_t chset) case CH_UTF16LE: case CH_UTF16BE: case CH_UTF16MUNGED: - return strlen_m_term((const char *)var); + case CH_UTF8: + return strlen_m_ext_term((const char *)var, chset); case CH_DISPLAY: case CH_DOS: case CH_UNIX: - case CH_UTF8: return strlen((const char *)var)+1; } -- 2.34.1