librpc: finally merge ndr_string.c.

Guenther

3 files changed, 2 insertions, 707 deletions

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 5fe944a7f1..ec4496c727 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -8,7 +8,7 @@ dcerpcsrcdir = $(librpcsrcdir)/rpc
 PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET \
 					  LIBSAMBA-HOSTCONFIG
 
-LIBNDR_OBJ_FILES = $(addprefix $(ndrsrcdir)/, ndr_string.o) ../librpc/ndr/ndr_basic.o ../librpc/ndr/uuid.o ../librpc/ndr/ndr.o ../librpc/gen_ndr/ndr_misc.o ../librpc/ndr/ndr_misc.o
+LIBNDR_OBJ_FILES = ../librpc/ndr/ndr_string.o ../librpc/ndr/ndr_basic.o ../librpc/ndr/uuid.o ../librpc/ndr/ndr.o ../librpc/gen_ndr/ndr_misc.o ../librpc/ndr/ndr_misc.o
 
 PC_FILES += ../librpc/ndr.pc
 LIBNDR_VERSION = 0.0.1
diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c
deleted file mode 100644
index 08c3c7fc6e..0000000000
--- a/source4/librpc/ndr/ndr_string.c
+++ /dev/null
@@ -1,705 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   routines for marshalling/unmarshalling string types
-
-   Copyright (C) Andrew Tridgell 2003
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "librpc/ndr/libndr.h"
-
-/**
-  pull a general string from the wire
-*/
-_PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const char **s)
-{
-	char *as=NULL;
-	uint32_t len1, ofs, len2;
-	uint16_t len3;
-	size_t ret;
-	charset_t chset = CH_UTF16;
-	unsigned byte_mul = 2;
-	unsigned flags = ndr->flags;
-	unsigned c_len_term = 0;
-
-	if (!(ndr_flags & NDR_SCALARS)) {
-		return NDR_ERR_SUCCESS;
-	}
-
-	if (NDR_BE(ndr)) {
-		chset = CH_UTF16BE;
-	}
-
-	if (flags & LIBNDR_FLAG_STR_ASCII) {
-		chset = CH_DOS;
-		byte_mul = 1;
-		flags &= ~LIBNDR_FLAG_STR_ASCII;
-	}
-
-	if (flags & LIBNDR_FLAG_STR_UTF8) {
-		chset = CH_UTF8;
-		byte_mul = 1;
-		flags &= ~LIBNDR_FLAG_STR_UTF8;
-	}
-
-	flags &= ~LIBNDR_FLAG_STR_CONFORMANT;
-	if (flags & LIBNDR_FLAG_STR_CHARLEN) {
-		c_len_term = 1;
-		flags &= ~LIBNDR_FLAG_STR_CHARLEN;
-	}
-
-	switch (flags & LIBNDR_STRING_FLAGS) {
-	case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4:
-	case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM:
-		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &len1));
-		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &ofs));
-		if (ofs != 0) {
-			return ndr_pull_error(ndr, NDR_ERR_STRING, "non-zero array offset with string flags 0x%x\n",
-					      ndr->flags & LIBNDR_STRING_FLAGS);
-		}
-		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &len2));
-		if (len2 > len1) {
-			return ndr_pull_error(ndr, NDR_ERR_STRING, 
-					      "Bad string lengths len1=%u ofs=%u len2=%u\n", 
-					      len1, ofs, len2);
-		}
-		NDR_PULL_NEED_BYTES(ndr, (len2 + c_len_term)*byte_mul);
-		if (len2 == 0) {
-			as = talloc_strdup(ndr->current_mem_ctx, "");
-		} else {
-			if (!convert_string_talloc(ndr->current_mem_ctx,
-						    chset, CH_UNIX, 
-						    ndr->data+ndr->offset, 
-						    (len2 + c_len_term)*byte_mul,
-						    (void **)&as, &ret, false)) {
-				return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-						      "Bad character conversion with flags 0x%x", flags);
-			}
-		}
-		NDR_CHECK(ndr_pull_advance(ndr, (len2 + c_len_term)*byte_mul));
-
-		if (len1 != len2) {
-			DEBUG(6,("len1[%u] != len2[%u] '%s'\n", len1, len2, as));
-		}
-
-		/* this is a way of detecting if a string is sent with the wrong
-		   termination */
-		if (ndr->flags & LIBNDR_FLAG_STR_NOTERM) {
-			if (strlen(as) < (len2 + c_len_term)) {
-				DEBUG(6,("short string '%s'\n", as));
-			}
-		} else {
-			if (strlen(as) == (len2 + c_len_term)) {
-				DEBUG(6,("long string '%s'\n", as));
-			}
-		}
-		*s = as;
-		break;
-
-	case LIBNDR_FLAG_STR_SIZE4:
-	case LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM:
-		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &len1));
-		NDR_PULL_NEED_BYTES(ndr, (len1 + c_len_term)*byte_mul);
-		if (len1 == 0) {
-			as = talloc_strdup(ndr->current_mem_ctx, "");
-		} else {
-			if (!convert_string_talloc(ndr->current_mem_ctx,
-						    chset, CH_UNIX, 
-						    ndr->data+ndr->offset, 
-						    (len1 + c_len_term)*byte_mul,
-						    (void **)&as, &ret, false)) {
-				return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-						      "Bad character conversion with flags 0x%x", flags);
-			}
-		}
-		NDR_CHECK(ndr_pull_advance(ndr, (len1 + c_len_term)*byte_mul));
-
-		/* this is a way of detecting if a string is sent with the wrong
-		   termination */
-		if (ndr->flags & LIBNDR_FLAG_STR_NOTERM) {
-			if (strlen(as) < (len1 + c_len_term)) {
-				DEBUG(6,("short string '%s'\n", as));
-			}
-		} else {
-			if (strlen(as) == (len1 + c_len_term)) {
-				DEBUG(6,("long string '%s'\n", as));
-			}
-		}
-		*s = as;
-		break;
-
-	case LIBNDR_FLAG_STR_LEN4:
-	case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_NOTERM:
-		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &ofs));
-		if (ofs != 0) {
-			return ndr_pull_error(ndr, NDR_ERR_STRING, "non-zero array offset with string flags 0x%x\n",
-					      ndr->flags & LIBNDR_STRING_FLAGS);
-		}
-		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &len1));
-		NDR_PULL_NEED_BYTES(ndr, (len1 + c_len_term)*byte_mul);
-		if (len1 == 0) {
-			as = talloc_strdup(ndr->current_mem_ctx, "");
-		} else {
-			if (!convert_string_talloc(ndr->current_mem_ctx,
-						    chset, CH_UNIX, 
-						    ndr->data+ndr->offset, 
-						    (len1 + c_len_term)*byte_mul,
-						    (void **)&as, &ret, false)) {
-				return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-						      "Bad character conversion with flags 0x%x", flags);
-			}
-		}
-		NDR_CHECK(ndr_pull_advance(ndr, (len1 + c_len_term)*byte_mul));
-
-		/* this is a way of detecting if a string is sent with the wrong
-		   termination */
-		if (ndr->flags & LIBNDR_FLAG_STR_NOTERM) {
-			if (strlen(as) < (len1 + c_len_term)) {
-				DEBUG(6,("short string '%s'\n", as));
-			}
-		} else {
-			if (strlen(as) == (len1 + c_len_term)) {
-				DEBUG(6,("long string '%s'\n", as));
-			}
-		}
-		*s = as;
-		break;
-
-
-	case LIBNDR_FLAG_STR_SIZE2:
-	case LIBNDR_FLAG_STR_SIZE2|LIBNDR_FLAG_STR_NOTERM:
-		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &len3));
-		NDR_PULL_NEED_BYTES(ndr, (len3 + c_len_term)*byte_mul);
-		if (len3 == 0) {
-			as = talloc_strdup(ndr->current_mem_ctx, "");
-		} else {
-			if (!convert_string_talloc(ndr->current_mem_ctx,
-						    chset, CH_UNIX, 
-						    ndr->data+ndr->offset, 
-						    (len3 + c_len_term)*byte_mul,
-						    (void **)&as, &ret, false)) {
-				return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-						      "Bad character conversion with flags 0x%x", flags);
-			}
-		}
-		NDR_CHECK(ndr_pull_advance(ndr, (len3 + c_len_term)*byte_mul));
-
-		/* this is a way of detecting if a string is sent with the wrong
-		   termination */
-		if (ndr->flags & LIBNDR_FLAG_STR_NOTERM) {
-			if (strlen(as) < (len3 + c_len_term)) {
-				DEBUG(6,("short string '%s'\n", as));
-			}
-		} else {
-			if (strlen(as) == (len3 + c_len_term)) {
-				DEBUG(6,("long string '%s'\n", as));
-			}
-		}
-		*s = as;
-		break;
-
-	case LIBNDR_FLAG_STR_SIZE2|LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_STR_BYTESIZE:
-		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &len3));
-		NDR_PULL_NEED_BYTES(ndr, len3);
-		if (len3 == 0) {
-			as = talloc_strdup(ndr->current_mem_ctx, "");
-		} else {
-			if (!convert_string_talloc(ndr->current_mem_ctx,
-						    chset, CH_UNIX, 
-						    ndr->data+ndr->offset, 
-						    len3,
-						    (void **)&as, &ret, false)) {
-				return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-						      "Bad character conversion with flags 0x%x", flags);
-			}
-		}
-		NDR_CHECK(ndr_pull_advance(ndr, len3));
-		*s = as;
-		break;
-
-	case LIBNDR_FLAG_STR_NULLTERM:
-		if (byte_mul == 1) {
-			len1 = ascii_len_n((const char *)(ndr->data+ndr->offset), ndr->data_size - ndr->offset);
-		} else {
-			len1 = utf16_len_n(ndr->data+ndr->offset, ndr->data_size - ndr->offset);
-		}
-		if (!convert_string_talloc(ndr->current_mem_ctx,
-					    chset, CH_UNIX, 
-					    ndr->data+ndr->offset, 
-					    len1,
-					    (void **)&as, &ret, false)) {
-			return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-					      "Bad character conversion with flags 0x%x", flags);
-		}
-		NDR_CHECK(ndr_pull_advance(ndr, len1));
-		*s = as;
-		break;
-
-	case LIBNDR_FLAG_STR_NOTERM:
-		if (!(ndr->flags & LIBNDR_FLAG_REMAINING)) {
-			return ndr_pull_error(ndr, NDR_ERR_STRING, "Bad string flags 0x%x (missing NDR_REMAINING)\n",
-					      ndr->flags & LIBNDR_STRING_FLAGS);
-		}
-
-		len1 = ndr->data_size - ndr->offset;
-
-		NDR_PULL_NEED_BYTES(ndr, len1);
-		if (len1 == 0) {
-			as = talloc_strdup(ndr->current_mem_ctx, "");
-		} else {
-			if (!convert_string_talloc(ndr->current_mem_ctx,
-						    chset, CH_UNIX, 
-						    ndr->data+ndr->offset, 
-						    len1,
-						    (void **)&as, &ret, false)) {
-				return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-						      "Bad character conversion with flags 0x%x", flags);
-			}
-		}
-		NDR_CHECK(ndr_pull_advance(ndr, len1));
-
-		*s = as;
-		break;
-
-	default:
-		return ndr_pull_error(ndr, NDR_ERR_STRING, "Bad string flags 0x%x\n",
-				      ndr->flags & LIBNDR_STRING_FLAGS);
-	}
-
-	return NDR_ERR_SUCCESS;
-}
-
-
-/**
-  push a general string onto the wire
-*/
-_PUBLIC_ enum ndr_err_code ndr_push_string(struct ndr_push *ndr, int ndr_flags, const char *s)
-{
-	size_t s_len, c_len, d_len;
-	int chset = CH_UTF16;
-	unsigned flags = ndr->flags;
-	unsigned byte_mul = 2;
-	uint8_t *dest = NULL;
-
-	if (!(ndr_flags & NDR_SCALARS)) {
-		return NDR_ERR_SUCCESS;
-	}
-
-	if (NDR_BE(ndr)) {
-		chset = CH_UTF16BE;
-	}
-	
-	s_len = s?strlen(s):0;
-
-	if (flags & LIBNDR_FLAG_STR_ASCII) {
-		chset = CH_DOS;
-		byte_mul = 1;
-		flags &= ~LIBNDR_FLAG_STR_ASCII;
-	}
-
-	if (flags & LIBNDR_FLAG_STR_UTF8) {
-		chset = CH_UTF8;
-		byte_mul = 1;
-		flags &= ~LIBNDR_FLAG_STR_UTF8;
-	}
-
-	flags &= ~LIBNDR_FLAG_STR_CONFORMANT;
-
-	if (!(flags & LIBNDR_FLAG_STR_NOTERM)) {
-		s_len++;
-	}
-	if (!convert_string_talloc(ndr, CH_UNIX, chset, s, s_len, (void **)&dest, &d_len, false)) {
-		return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
-				      "Bad character push conversion with flags 0x%x", flags);
-	}
-
-	if (flags & LIBNDR_FLAG_STR_BYTESIZE) {
-		c_len = d_len;
-		flags &= ~LIBNDR_FLAG_STR_BYTESIZE;
-	} else if (flags & LIBNDR_FLAG_STR_CHARLEN) {
-		c_len = (d_len / byte_mul)-1;
-		flags &= ~LIBNDR_FLAG_STR_CHARLEN;
-	} else {
-		c_len = d_len / byte_mul;
-	}
-
-	switch ((flags & LIBNDR_STRING_FLAGS) & ~LIBNDR_FLAG_STR_NOTERM) {
-	case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4:
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len));
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len));
-		NDR_CHECK(ndr_push_bytes(ndr, dest, d_len));
-		break;
-
-	case LIBNDR_FLAG_STR_LEN4:
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len));
-		NDR_CHECK(ndr_push_bytes(ndr, dest, d_len));
-		break;
-
-	case LIBNDR_FLAG_STR_SIZE4:
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len));
-		NDR_CHECK(ndr_push_bytes(ndr, dest, d_len));
-		break;
-
-	case LIBNDR_FLAG_STR_SIZE2:
-		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, c_len));
-		NDR_CHECK(ndr_push_bytes(ndr, dest, d_len));
-		break;
-
-	case LIBNDR_FLAG_STR_NULLTERM:
-		NDR_CHECK(ndr_push_bytes(ndr, dest, d_len));
-		break;
-
-	default:
-		if (ndr->flags & LIBNDR_FLAG_REMAINING) {
-			NDR_CHECK(ndr_push_bytes(ndr, dest, d_len));
-			break;		
-		}
-
-		return ndr_push_error(ndr, NDR_ERR_STRING, "Bad string flags 0x%x\n",
-				      ndr->flags & LIBNDR_STRING_FLAGS);
-	}
-
-	talloc_free(dest);
-
-	return NDR_ERR_SUCCESS;
-}
-
-/**
-  push a general string onto the wire
-*/
-_PUBLIC_ size_t ndr_string_array_size(struct ndr_push *ndr, const char *s)
-{
-	size_t c_len;
-	unsigned flags = ndr->flags;
-	unsigned byte_mul = 2;
-	unsigned c_len_term = 1;
-
-	c_len = s?strlen_m(s):0;
-
-	if (flags & (LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_UTF8)) {
-		byte_mul = 1;
-	}
-
-	if (flags & LIBNDR_FLAG_STR_NOTERM) {
-		c_len_term = 0;
-	}
-
-	c_len = c_len + c_len_term;
-
-	if (flags & LIBNDR_FLAG_STR_BYTESIZE) {
-		c_len = c_len * byte_mul;
-	}
-
-	return c_len;
-}
-
-_PUBLIC_ void ndr_print_string(struct ndr_print *ndr, const char *name, const char *s)
-{
-	if (s) {
-		ndr->print(ndr, "%-25s: '%s'", name, s);
-	} else {
-		ndr->print(ndr, "%-25s: NULL", name);
-	}
-}
-
-_PUBLIC_ uint32_t ndr_size_string(int ret, const char * const* string, int flags) 
-{
-	/* FIXME: Is this correct for all strings ? */
-	if(!(*string)) return ret;
-	return ret+strlen(*string)+1;
-}
-
-/**
-  pull a general string array from the wire
-*/
-_PUBLIC_ enum ndr_err_code ndr_pull_string_array(struct ndr_pull *ndr, int ndr_flags, const char ***_a)
-{
-	const char **a = NULL;
-	uint32_t count;
-	unsigned flags = ndr->flags;
-	unsigned saved_flags = ndr->flags;
-
-	if (!(ndr_flags & NDR_SCALARS)) {
-		return NDR_ERR_SUCCESS;
-	}
-
-	switch (flags & (LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_STR_NOTERM)) {
-	case LIBNDR_FLAG_STR_NULLTERM:
-		/* 
-		 * here the strings are null terminated
-		 * but also the array is null terminated
-		 */
-		for (count = 0;; count++) {
-			TALLOC_CTX *tmp_ctx;
-			const char *s = NULL;
-			a = talloc_realloc(ndr->current_mem_ctx, a, const char *, count + 2);
-			NDR_ERR_HAVE_NO_MEMORY(a);
-			a[count]   = NULL;
-			a[count+1]   = NULL;
-
-			tmp_ctx = ndr->current_mem_ctx;
-			ndr->current_mem_ctx = a;
-			NDR_CHECK(ndr_pull_string(ndr, ndr_flags, &s));
-			ndr->current_mem_ctx = tmp_ctx;
-			if (strcmp("", s)==0) {
-				a[count] = NULL;
-				break;
-			} else {
-				a[count] = s;
-			}
-		}
-
-		*_a =a;
-		break;
-
-	case LIBNDR_FLAG_STR_NOTERM:
-		if (!(ndr->flags & LIBNDR_FLAG_REMAINING)) {
-			return ndr_pull_error(ndr, NDR_ERR_STRING, "Bad string flags 0x%x (missing NDR_REMAINING)\n",
-					      ndr->flags & LIBNDR_STRING_FLAGS);
-		}
-		/*
-		 * here the strings are not null terminated
-		 * but serarated by a null terminator
-		 *
-		 * which means the same as:
-		 * very string is null terminated exept the last
-		 * string is terminated by the end of the buffer
-		 *
-		 * as LIBNDR_FLAG_STR_NULLTERM also end at the end
-		 * of the buffer, we can pull each string with this flag
-		 */
-		ndr->flags &= ~(LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING);
-		ndr->flags |= LIBNDR_FLAG_STR_NULLTERM;
-
-		for (count = 0; ((ndr->data_size - ndr->offset) > 0); count++) {
-			TALLOC_CTX *tmp_ctx;
-			const char *s = NULL;
-			a = talloc_realloc(ndr->current_mem_ctx, a, const char *, count + 2);
-			NDR_ERR_HAVE_NO_MEMORY(a);
-			a[count]   = NULL;
-			a[count+1]   = NULL;
-
-			tmp_ctx = ndr->current_mem_ctx;
-			ndr->current_mem_ctx = a;
-			NDR_CHECK(ndr_pull_string(ndr, ndr_flags, &s));
-			ndr->current_mem_ctx = tmp_ctx;
-			a[count] = s;
-		}
-
-		*_a =a;
-		break;
-
-	default:
-		return ndr_pull_error(ndr, NDR_ERR_STRING, "Bad string flags 0x%x\n",
-				      ndr->flags & LIBNDR_STRING_FLAGS);
-	}
-
-	ndr->flags = saved_flags;
-	return NDR_ERR_SUCCESS;
-}
-
-/**
-  push a general string array onto the wire
-*/
-_PUBLIC_ enum ndr_err_code ndr_push_string_array(struct ndr_push *ndr, int ndr_flags, const char **a)
-{
-	uint32_t count;
-	unsigned flags = ndr->flags;
-	unsigned saved_flags = ndr->flags;
-
-	if (!(ndr_flags & NDR_SCALARS)) {
-		return NDR_ERR_SUCCESS;
-	}
-
-	switch (flags & LIBNDR_STRING_FLAGS) {
-	case LIBNDR_FLAG_STR_NULLTERM:
-		for (count = 0; a && a[count]; count++) {
-			NDR_CHECK(ndr_push_string(ndr, ndr_flags, a[count]));
-		}
-
-		NDR_CHECK(ndr_push_string(ndr, ndr_flags, ""));
-		break;
-
-	case LIBNDR_FLAG_STR_NOTERM:
-		if (!(ndr->flags & LIBNDR_FLAG_REMAINING)) {
-			return ndr_push_error(ndr, NDR_ERR_STRING, "Bad string flags 0x%x (missing NDR_REMAINING)\n",
-					      ndr->flags & LIBNDR_STRING_FLAGS);
-		}
-
-		for (count = 0; a && a[count]; count++) {
-			if (count > 0) {
-				ndr->flags &= ~(LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING);
-				ndr->flags |= LIBNDR_FLAG_STR_NULLTERM;
-				NDR_CHECK(ndr_push_string(ndr, ndr_flags, ""));
-				ndr->flags = saved_flags;
-			}
-			NDR_CHECK(ndr_push_string(ndr, ndr_flags, a[count]));
-		}
-
-		break;
-
-	default:
-		return ndr_push_error(ndr, NDR_ERR_STRING, "Bad string flags 0x%x\n",
-				      ndr->flags & LIBNDR_STRING_FLAGS);
-	}
-	
-	ndr->flags = saved_flags;
-	return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ void ndr_print_string_array(struct ndr_print *ndr, const char *name, const char **a)
-{
-	uint32_t count;
-	uint32_t i;
-
-	for (count = 0; a && a[count]; count++) {}
-
-	ndr->print(ndr, "%s: ARRAY(%d)", name, count);
-	ndr->depth++;
-	for (i=0;i<count;i++) {
-		char *idx=NULL;
-		if (asprintf(&idx, "[%d]", i) != -1) {
-			ndr_print_string(ndr, idx, a[i]);
-			free(idx);
-		}
-	}
-	ndr->depth--;
-}
-
-_PUBLIC_ size_t ndr_size_string_array(const char **a, uint32_t count, int flags)
-{
-	uint32_t i;
-	size_t size = 0;
-
-	switch (flags & LIBNDR_STRING_FLAGS) {
-	case LIBNDR_FLAG_STR_NULLTERM:
-		for (i = 0; i < count; i++) {
-			size += strlen_m_term(a[i]);
-		}
-		break;
-	case LIBNDR_FLAG_STR_NOTERM:
-		for (i = 0; i < count; i++) {
-			size += strlen_m(a[i]);
-		}
-		break;
-	default:
-		return 0;
-	}
-
-	return size;
-}
-
-/**
- * Return number of elements in a string including the last (zeroed) element 
- */
-_PUBLIC_ uint32_t ndr_string_length(const void *_var, uint32_t element_size)
-{
-	uint32_t i;
-	uint8_t zero[4] = {0,0,0,0};
-	const char *var = (const char *)_var;
-
-	for (i = 0; memcmp(var+i*element_size,zero,element_size) != 0; i++);
-
-	return i+1;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_check_string_terminator(struct ndr_pull *ndr, uint32_t count, uint32_t element_size)
-{
-	uint32_t i;
-	uint32_t save_offset;
-
-	save_offset = ndr->offset;
-	ndr_pull_advance(ndr, (count - 1) * element_size);
-	NDR_PULL_NEED_BYTES(ndr, element_size);
-
-	for (i = 0; i < element_size; i++) {
-		 if (ndr->data[ndr->offset+i] != 0) {
-			ndr->offset = save_offset;
-
-			return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "String terminator not present or outside string boundaries");
-		 }
-	}
-
-	ndr->offset = save_offset;
-
-	return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const char **var, uint32_t length, uint8_t byte_mul, charset_t chset)
-{
-	size_t ret;
-	if (length == 0) {
-		*var = talloc_strdup(ndr->current_mem_ctx, "");
-		return NDR_ERR_SUCCESS;
-	}
-
-	if (NDR_BE(ndr) && chset == CH_UTF16) {
-		chset = CH_UTF16BE;
-	}
-
-	NDR_PULL_NEED_BYTES(ndr, length*byte_mul);
-
-	if (!convert_string_talloc(ndr->current_mem_ctx, 
-				    chset, CH_UNIX, 
-				    ndr->data+ndr->offset, 
-				    length*byte_mul,
-				    discard_const_p(void *, var), &ret, false)) {
-		return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-				      "Bad character conversion");
-	}
-	NDR_CHECK(ndr_pull_advance(ndr, length*byte_mul));
-
-	return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const char *var, uint32_t length, uint8_t byte_mul, charset_t chset)
-{
-	size_t ret, required;
-
-	if (NDR_BE(ndr) && chset == CH_UTF16) {
-		chset = CH_UTF16BE;
-	}
-
-	required = byte_mul * length;
-	
-	NDR_PUSH_NEED_BYTES(ndr, required);
-	ret = convert_string(CH_UNIX, chset, var, strlen(var),
-			     ndr->data+ndr->offset, required, false);
-	if (ret == -1) {
-		return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
-				      "Bad character conversion");
-	}
-
-	/* Make sure the remaining part of the string is filled with zeroes */
-	if (ret < required) {
-		memset(ndr->data+ndr->offset+ret, 0, required-ret);
-	}
-
-	ndr->offset += required;
-
-	return NDR_ERR_SUCCESS;
-}
-
-/* Return number of elements in a string in the specified charset */
-_PUBLIC_ uint32_t ndr_charset_length(const void *var, charset_t chset)
-{
-	/* FIXME: Treat special chars special here, taking chset into account */
-	/* Also include 0 byte */
-	return strlen((const char *)var)+1;
-}
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index d363b8f29b..234fe425c9 100644
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -4,7 +4,7 @@ bld.RECURSE('../../librpc/idl')
 bld.RECURSE('idl')
 
 bld.SAMBA_LIBRARY('LIBNDR',
-	source='ndr/ndr_string.c ../../librpc/ndr/ndr_basic.c ../../librpc/ndr/uuid.c ../../librpc/ndr/ndr.c ../../librpc/ndr/ndr_misc.c ../../librpc/gen_ndr/ndr_misc.c',
+	source='../../librpc/ndr/ndr_string.c ../../librpc/ndr/ndr_basic.c ../../librpc/ndr/uuid.c ../../librpc/ndr/ndr.c ../../librpc/ndr/ndr_misc.c ../../librpc/gen_ndr/ndr_misc.c',
 	pc_files='../../librpc/ndr.pc',
 	public_deps='LIBSAMBA-ERRORS talloc LIBSAMBA-UTIL CHARSET LIBSAMBA-HOSTCONFIG',
 	public_headers='../../librpc/gen_ndr/misc.h ../../librpc/gen_ndr/ndr_misc.h ../../librpc/ndr/libndr.h:ndr.h',