The branch, master has been updated via c94f1c1... s3-libndr: make sure ndr_pull_string_array() only inspects string termination flags. from edecdab... s4:heimdal_build: move #undef __APPLE__ to the end of roken.h
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c94f1c16bd6fff25f582ecfa920513b9c9665629 Author: Günther Deschner <g...@samba.org> Date: Thu May 13 02:27:29 2010 +0200 s3-libndr: make sure ndr_pull_string_array() only inspects string termination flags. Otherwise the NOTERM case is not reachable for ascii strings (only utf16). With this patch we now can have: [flag(STR_ASCII|STR_NOTERM|NDR_REMAINING)] string_array array_name; Guenther ----------------------------------------------------------------------- Summary of changes: source3/librpc/ndr/ndr_string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/librpc/ndr/ndr_string.c b/source3/librpc/ndr/ndr_string.c index 519be7b..b4891e3 100644 --- a/source3/librpc/ndr/ndr_string.c +++ b/source3/librpc/ndr/ndr_string.c @@ -452,7 +452,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 -- Samba Shared Repository