From 3edb95a487b3330408392cb856ae42cde5f679f9 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 14 May 2010 14:51:44 +0200 Subject: s4-libndr: fix ndr_pull_string_array() for non utf16 arrays in s4 as well. Guenther --- source4/librpc/ndr/ndr_string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/librpc/ndr') diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c index d4e04c12b4..dfa72b5262 100644 --- a/source4/librpc/ndr/ndr_string.c +++ b/source4/librpc/ndr/ndr_string.c @@ -444,7 +444,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string_array(struct ndr_pull *ndr, int ndr_f return NDR_ERR_SUCCESS; } - switch (flags & LIBNDR_STRING_FLAGS) { + switch (flags & (LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_STR_NOTERM)) { case LIBNDR_FLAG_STR_NULLTERM: /* * here the strings are null terminated -- cgit