summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-05-14 14:51:44 +0200
committerGünther Deschner <gd@samba.org>2010-05-14 14:51:44 +0200
commit3edb95a487b3330408392cb856ae42cde5f679f9 (patch)
tree8f1a36183f0a72750cc107664300016873b1d8d8
parenta052aa87be3ac8fa6167ade27f756dd44f5fc2c3 (diff)
downloadsamba-3edb95a487b3330408392cb856ae42cde5f679f9.tar.gz
samba-3edb95a487b3330408392cb856ae42cde5f679f9.tar.bz2
samba-3edb95a487b3330408392cb856ae42cde5f679f9.zip
s4-libndr: fix ndr_pull_string_array() for non utf16 arrays in s4 as well.
Guenther
-rw-r--r--source4/librpc/ndr/ndr_string.c2
1 files changed, 1 insertions, 1 deletions
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