Merge branch 'tdr' of /home/jelmer/samba4

10 files changed, 7 insertions, 664 deletions

diff --git a/source4/Makefile b/source4/Makefile
index 15b1b8ba403..c42f0ba9fff 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -77,7 +77,7 @@ nsswrappersrcdir := ../lib/nss_wrapper
 appwebsrcdir := lib/appweb
 libstreamsrcdir := lib/stream
 libutilsrcdir := ../lib/util
-libtdrsrcdir := lib/tdr
+libtdrsrcdir := ../lib/tdr
 libcryptosrcdir := ../lib/crypto
 libtorturesrcdir := ../lib/torture
 smb_serversrcdir := smb_server
diff --git a/source4/auth/config.m4 b/source4/auth/config.m4
index a271a9f6fe4..fb9ee58c60f 100644
--- a/source4/auth/config.m4
+++ b/source4/auth/config.m4
@@ -27,6 +27,7 @@ if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_cli
 	SASL_CFLAGS="$CFLAGS"
 	SASL_CPPFLAGS="$CPPFLAGS"
 	SASL_LDFLAGS="$LDFLAGS"
+	LIB_REMOVE_USR_LIB(SASL_LDFLAGS)
 else
 	SMB_ENABLE(cyrus_sasl,NO)
 fi
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index ffdf92f7844..6860e56e7fc 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -99,11 +99,13 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
 					AC_MSG_WARN([cannot run when cross-compiling]))
 				CFLAGS="$OLD_CFLAGS"
 
+				ac_cv_$1_libs_only_other="`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`"
+				LIB_REMOVE_USR_LIB(ac_cv_$1_libs_only_other)
 				SMB_EXT_LIB($1, 
 					[`$PKG_CONFIG --libs-only-l '$2'`], 
 					[`$PKG_CONFIG --cflags-only-other '$2'`],
 					[`$PKG_CONFIG --cflags-only-I '$2'`],
-					[`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`])
+					[$ac_cv_$1_libs_only_other])
 				ac_cv_$1_found=yes
 
 			else
diff --git a/source4/lib/tdr/TODO b/source4/lib/tdr/TODO
deleted file mode 100644
index 5093afd4387..00000000000
--- a/source4/lib/tdr/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- Support read/write (to fd) as well as push/pull (to DATA_BLOB)
diff --git a/source4/lib/tdr/config.mk b/source4/lib/tdr/config.mk
deleted file mode 100644
index 07506ec6472..00000000000
--- a/source4/lib/tdr/config.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-[SUBSYSTEM::TDR]
-CFLAGS = -Ilib/tdr
-PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
-
-TDR_OBJ_FILES = $(libtdrsrcdir)/tdr.o
-
-$(eval $(call proto_header_template,$(libtdrsrcdir)/tdr_proto.h,$(TDR_OBJ_FILES:.o=.c)))
-
-PUBLIC_HEADERS += $(libtdrsrcdir)/tdr.h
diff --git a/source4/lib/tdr/tdr.c b/source4/lib/tdr/tdr.c
deleted file mode 100644
index 8b62ea0c2b9..00000000000
--- a/source4/lib/tdr/tdr.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   TDR (Trivial Data Representation) helper functions
-     Based loosely on ndr.c by Andrew Tridgell.
-
-   Copyright (C) Jelmer Vernooij 2005
-   
-   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 "system/filesys.h"
-#include "system/network.h"
-#include "tdr/tdr.h"
-
-#define TDR_BASE_MARSHALL_SIZE 1024
-
-#define TDR_PUSH_NEED_BYTES(tdr, n) TDR_CHECK(tdr_push_expand(tdr, tdr->data.length+(n)))
-
-#define TDR_PULL_NEED_BYTES(tdr, n) do { \
-	if ((n) > tdr->data.length || tdr->offset + (n) > tdr->data.length) { \
-		return NT_STATUS_BUFFER_TOO_SMALL; \
-	} \
-} while(0)
-
-#define TDR_BE(tdr) ((tdr)->flags & TDR_BIG_ENDIAN)
-
-#define TDR_CVAL(tdr, ofs) CVAL(tdr->data.data,ofs)
-#define TDR_SVAL(tdr, ofs) (TDR_BE(tdr)?RSVAL(tdr->data.data,ofs):SVAL(tdr->data.data,ofs))
-#define TDR_IVAL(tdr, ofs) (TDR_BE(tdr)?RIVAL(tdr->data.data,ofs):IVAL(tdr->data.data,ofs))
-#define TDR_SCVAL(tdr, ofs, v) SCVAL(tdr->data.data,ofs,v)
-#define TDR_SSVAL(tdr, ofs, v) do { if (TDR_BE(tdr))  { RSSVAL(tdr->data.data,ofs,v); } else SSVAL(tdr->data.data,ofs,v); } while (0)
-#define TDR_SIVAL(tdr, ofs, v) do { if (TDR_BE(tdr))  { RSIVAL(tdr->data.data,ofs,v); } else SIVAL(tdr->data.data,ofs,v); } while (0)
-
-/**
-  expand the available space in the buffer to 'size'
-*/
-NTSTATUS tdr_push_expand(struct tdr_push *tdr, uint32_t size)
-{
-	if (talloc_get_size(tdr->data.data) >= size) {
-		return NT_STATUS_OK;
-	}
-
-	tdr->data.data = talloc_realloc(tdr, tdr->data.data, uint8_t, tdr->data.length + TDR_BASE_MARSHALL_SIZE);
-
-	if (tdr->data.data == NULL)
-		return NT_STATUS_NO_MEMORY;
-
-	return NT_STATUS_OK;
-}
-
-
-NTSTATUS tdr_pull_uint8(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint8_t *v)
-{
-	TDR_PULL_NEED_BYTES(tdr, 1);
-	*v = TDR_CVAL(tdr, tdr->offset);
-	tdr->offset += 1;
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_push_uint8(struct tdr_push *tdr, const uint8_t *v)
-{
-	TDR_PUSH_NEED_BYTES(tdr, 1);
-	TDR_SCVAL(tdr, tdr->data.length, *v);
-	tdr->data.length += 1;
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_print_uint8(struct tdr_print *tdr, const char *name, uint8_t *v)
-{
-	tdr->print(tdr, "%-25s: 0x%02x (%u)", name, *v, *v);
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_pull_uint16(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint16_t *v)
-{
-	TDR_PULL_NEED_BYTES(tdr, 2);
-	*v = TDR_SVAL(tdr, tdr->offset);
-	tdr->offset += 2;
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_push_uint16(struct tdr_push *tdr, const uint16_t *v)
-{
-	TDR_PUSH_NEED_BYTES(tdr, 2);
-	TDR_SSVAL(tdr, tdr->data.length, *v);
-	tdr->data.length += 2;
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_print_uint16(struct tdr_print *tdr, const char *name, uint16_t *v)
-{
-	tdr->print(tdr, "%-25s: 0x%02x (%u)", name, *v, *v);
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_pull_uint32(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint32_t *v)
-{
-	TDR_PULL_NEED_BYTES(tdr, 4);
-	*v = TDR_IVAL(tdr, tdr->offset);
-	tdr->offset += 4;
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_push_uint32(struct tdr_push *tdr, const uint32_t *v)
-{
-	TDR_PUSH_NEED_BYTES(tdr, 4);
-	TDR_SIVAL(tdr, tdr->data.length, *v);
-	tdr->data.length += 4;
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_print_uint32(struct tdr_print *tdr, const char *name, uint32_t *v)
-{
-	tdr->print(tdr, "%-25s: 0x%02x (%u)", name, *v, *v);
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v, uint32_t length, uint32_t el_size, charset_t chset)
-{
-	size_t ret;
-
-	if (length == -1) {
-		switch (chset) {
-			case CH_DOS:
-				length = ascii_len_n((const char*)tdr->data.data+tdr->offset, tdr->data.length-tdr->offset);
-				break;
-			case CH_UTF16:
-				length = utf16_len_n(tdr->data.data+tdr->offset, tdr->data.length-tdr->offset);
-				break;
-
-			default:
-				return NT_STATUS_INVALID_PARAMETER;
-		}
-	}
-
-	if (length == 0) {
-		*v = talloc_strdup(ctx, "");
-		return NT_STATUS_OK;
-	}
-
-	TDR_PULL_NEED_BYTES(tdr, el_size*length);
-	
-	if (!convert_string_talloc_convenience(ctx, tdr->iconv_convenience, chset, CH_UNIX, tdr->data.data+tdr->offset, el_size*length, discard_const_p(void *, v), &ret, false)) {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	tdr->offset += length * el_size;
-
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length, uint32_t el_size, charset_t chset)
-{
-	size_t ret, required;
-
-	if (length == -1) {
-		length = strlen(*v) + 1; /* Extra element for null character */
-	}
-
-	required = el_size * length;
-	TDR_PUSH_NEED_BYTES(tdr, required);
-
-	if (!convert_string_convenience(tdr->iconv_convenience, CH_UNIX, chset, *v, strlen(*v), tdr->data.data+tdr->data.length, required, &ret, false)) {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	/* Make sure the remaining part of the string is filled with zeroes */
-	if (ret < required) {
-		memset(tdr->data.data+tdr->data.length+ret, 0, required-ret);
-	}
-	
-	tdr->data.length += required;
-						 
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_print_charset(struct tdr_print *tdr, const char *name, const char **v, uint32_t length, uint32_t el_size, charset_t chset)
-{
-	tdr->print(tdr, "%-25s: %s", name, *v);
-	return NT_STATUS_OK;
-}
-
-/**
-  parse a hyper
-*/
-NTSTATUS tdr_pull_hyper(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint64_t *v)
-{
-	TDR_PULL_NEED_BYTES(tdr, 8);
-	*v = TDR_IVAL(tdr, tdr->offset);
-	*v |= (uint64_t)(TDR_IVAL(tdr, tdr->offset+4)) << 32;
-	tdr->offset += 8;
-	return NT_STATUS_OK;
-}
-
-/**
-  push a hyper
-*/
-NTSTATUS tdr_push_hyper(struct tdr_push *tdr, uint64_t *v)
-{
-	TDR_PUSH_NEED_BYTES(tdr, 8);
-	TDR_SIVAL(tdr, tdr->data.length, ((*v) & 0xFFFFFFFF));
-	TDR_SIVAL(tdr, tdr->data.length+4, ((*v)>>32));
-	tdr->data.length += 8;
-	return NT_STATUS_OK;
-}
-
-/**
-  push a NTTIME
-*/
-NTSTATUS tdr_push_NTTIME(struct tdr_push *tdr, NTTIME *t)
-{
-	TDR_CHECK(tdr_push_hyper(tdr, t));
-	return NT_STATUS_OK;
-}
-
-/**
-  pull a NTTIME
-*/
-NTSTATUS tdr_pull_NTTIME(struct tdr_pull *tdr, TALLOC_CTX *ctx, NTTIME *t)
-{
-	TDR_CHECK(tdr_pull_hyper(tdr, ctx, t));
-	return NT_STATUS_OK;
-}
-
-/**
-  push a time_t
-*/
-NTSTATUS tdr_push_time_t(struct tdr_push *tdr, time_t *t)
-{
-	return tdr_push_uint32(tdr, (uint32_t *)t);
-}
-
-/**
-  pull a time_t
-*/
-NTSTATUS tdr_pull_time_t(struct tdr_pull *tdr, TALLOC_CTX *ctx, time_t *t)
-{
-	uint32_t tt;
-	TDR_CHECK(tdr_pull_uint32(tdr, ctx, &tt));
-	*t = tt;
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_print_time_t(struct tdr_print *tdr, const char *name, time_t *t)
-{
-	if (*t == (time_t)-1 || *t == 0) {
-		tdr->print(tdr, "%-25s: (time_t)%d", name, (int)*t);
-	} else {
-		tdr->print(tdr, "%-25s: %s", name, timestring(tdr, *t));
-	}
-
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_print_NTTIME(struct tdr_print *tdr, const char *name, NTTIME *t)
-{
-	tdr->print(tdr, "%-25s: %s", name, nt_time_string(tdr, *t));
-
-	return NT_STATUS_OK;
-}
-
-NTSTATUS tdr_print_DATA_BLOB(struct tdr_print *tdr, const char *name, DATA_BLOB *r)
-{
-	tdr->print(tdr, "%-25s: DATA_BLOB length=%u", name, r->length);
-	if (r->length) {
-		dump_data(10, r->data, r->length);
-	}
-
-	return NT_STATUS_OK;
-}
-
-#define TDR_ALIGN(l,n) (((l) & ((n)-1)) == 0?0:((n)-((l)&((n)-1))))
-
-/*
-  push a DATA_BLOB onto the wire. 
-*/
-NTSTATUS tdr_push_DATA_BLOB(struct tdr_push *tdr, DATA_BLOB *blob)
-{
-	if (tdr->flags & TDR_ALIGN2) {
-		blob->length = TDR_ALIGN(tdr->data.length, 2);
-	} else if (tdr->flags & TDR_ALIGN4) {
-		blob->length = TDR_ALIGN(tdr->data.length, 4);
-	} else if (tdr->flags & TDR_ALIGN8) {
-		blob->length = TDR_ALIGN(tdr->data.length, 8);
-	}
-
-	TDR_PUSH_NEED_BYTES(tdr, blob->length);
-	
-	memcpy(tdr->data.data+tdr->data.length, blob->data, blob->length);
-	return NT_STATUS_OK;
-}
-
-/*
-  pull a DATA_BLOB from the wire. 
-*/
-NTSTATUS tdr_pull_DATA_BLOB(struct tdr_pull *tdr, TALLOC_CTX *ctx, DATA_BLOB *blob)
-{
-	uint32_t length;
-
-	if (tdr->flags & TDR_ALIGN2) {
-		length = TDR_ALIGN(tdr->offset, 2);
-	} else if (tdr->flags & TDR_ALIGN4) {
-		length = TDR_ALIGN(tdr->offset, 4);
-	} else if (tdr->flags & TDR_ALIGN8) {
-		length = TDR_ALIGN(tdr->offset, 8);
-	} else if (tdr->flags & TDR_REMAINING) {
-		length = tdr->data.length - tdr->offset;
-	} else {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	if (tdr->data.length - tdr->offset < length) {
-		length = tdr->data.length - tdr->offset;
-	}
-
-	TDR_PULL_NEED_BYTES(tdr, length);
-
-	*blob = data_blob_talloc(tdr, tdr->data.data+tdr->offset, length);
-	tdr->offset += length;
-	return NT_STATUS_OK;
-}
-
-struct tdr_push *tdr_push_init(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic)
-{
-	struct tdr_push *push = talloc_zero(mem_ctx, struct tdr_push);
-
-	if (push == NULL)
-		return NULL;
-
-	push->iconv_convenience = talloc_reference(push, ic);
-
-	return push;
-}
-
-struct tdr_pull *tdr_pull_init(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic)
-{
-	struct tdr_pull *pull = talloc_zero(mem_ctx, struct tdr_pull);
-
-	if (pull == NULL)
-		return NULL;
-
-	pull->iconv_convenience = talloc_reference(pull, ic);
-
-	return pull;
-}
-
-NTSTATUS tdr_push_to_fd(int fd, struct smb_iconv_convenience *iconv_convenience, tdr_push_fn_t push_fn, const void *p)
-{
-	struct tdr_push *push = tdr_push_init(NULL, iconv_convenience);
-
-	if (push == NULL)
-		return NT_STATUS_NO_MEMORY;
-
-	if (NT_STATUS_IS_ERR(push_fn(push, p))) {
-		DEBUG(1, ("Error pushing data\n"));
-		talloc_free(push);
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	if (write(fd, push->data.data, push->data.length) < push->data.length) {
-		DEBUG(1, ("Error writing all data\n"));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	talloc_free(push);
-
-	return NT_STATUS_OK;
-}
-
-void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...) _PRINTF_ATTRIBUTE(2,3)
-{
-	va_list ap;
-	char *s = NULL;
-	int i;
-
-	va_start(ap, format);
-	vasprintf(&s, format, ap);
-	va_end(ap);
-
-	for (i=0;i<tdr->level;i++) { DEBUG(0,("    ")); }
-
-	DEBUG(0,("%s\n", s));
-	free(s);
-}
diff --git a/source4/lib/tdr/tdr.h b/source4/lib/tdr/tdr.h
deleted file mode 100644
index c983cd35c14..00000000000
--- a/source4/lib/tdr/tdr.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   TDR definitions
-   Copyright (C) Jelmer Vernooij 2005
-   
-   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/>.
-*/
-
-#ifndef __TDR_H__
-#define __TDR_H__
-
-#include <talloc.h>
-#include "../lib/util/charset/charset.h"
-
-#define TDR_BIG_ENDIAN			0x01
-#define TDR_ALIGN2			0x02
-#define TDR_ALIGN4			0x04
-#define TDR_ALIGN8			0x08
-#define TDR_REMAINING			0x10
-
-struct tdr_pull {
-	DATA_BLOB data;
-	uint32_t offset;
-	int flags;
-	struct smb_iconv_convenience *iconv_convenience;
-};
-
-struct tdr_push {
-	DATA_BLOB data;
-	int flags;
-	struct smb_iconv_convenience *iconv_convenience;
-};
-
-struct tdr_print {
-	int level;
-	void (*print)(struct tdr_print *, const char *, ...);
-	int flags;
-};
-
-#define TDR_CHECK(call) do { NTSTATUS _status; \
-                             _status = call; \
-                             if (!NT_STATUS_IS_OK(_status)) \
-                                return _status; \
-                        } while (0)
-
-#define TDR_ALLOC(ctx, s, n) do { \
-	                       (s) = talloc_array_size(ctx, sizeof(*(s)), n); \
-                           if ((n) && !(s)) return NT_STATUS_NO_MEMORY; \
-                           } while (0)
-
-typedef NTSTATUS (*tdr_push_fn_t) (struct tdr_push *, const void *);
-typedef NTSTATUS (*tdr_pull_fn_t) (struct tdr_pull *, TALLOC_CTX *, void *);
-
-#include "lib/tdr/tdr_proto.h"
-
-#endif /* __TDR_H__ */
diff --git a/source4/lib/tdr/testsuite.c b/source4/lib/tdr/testsuite.c
deleted file mode 100644
index 44c5810f907..00000000000
--- a/source4/lib/tdr/testsuite.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   test suite for basic tdr functions
-
-   Copyright (C) Jelmer Vernooij 2007
-   
-   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 "torture/torture.h"
-#include "lib/tdr/tdr.h"
-#include "param/param.h"
-
-static bool test_push_uint8(struct torture_context *tctx)
-{
-	uint8_t v = 4;
-	struct tdr_push *tdr = tdr_push_init(tctx, lp_iconv_convenience(tctx->lp_ctx));
-
-	torture_assert_ntstatus_ok(tctx, tdr_push_uint8(tdr, &v), "push failed");
-	torture_assert_int_equal(tctx, tdr->data.length, 1, "length incorrect");
-	torture_assert_int_equal(tctx, tdr->data.data[0], 4, "data incorrect");
-	return true;
-}
-
-static bool test_pull_uint8(struct torture_context *tctx)
-{
-	uint8_t d = 2;
-	uint8_t l;
-	struct tdr_pull *tdr = tdr_pull_init(tctx, lp_iconv_convenience(tctx->lp_ctx));
-	tdr->data.data = &d;
-	tdr->data.length = 1;
-	tdr->offset = 0;
-	tdr->flags = 0;
-	torture_assert_ntstatus_ok(tctx, tdr_pull_uint8(tdr, tctx, &l), 
-							   "pull failed");
-	torture_assert_int_equal(tctx, 1, tdr->offset, 
-							 "offset invalid");
-	return true;
-}
-
-static bool test_push_uint16(struct torture_context *tctx)
-{
-	uint16_t v = 0xF32;
-	struct tdr_push *tdr = tdr_push_init(tctx, lp_iconv_convenience(tctx->lp_ctx));
-
-	torture_assert_ntstatus_ok(tctx, tdr_push_uint16(tdr, &v), "push failed");
-	torture_assert_int_equal(tctx, tdr->data.length, 2, "length incorrect");
-	torture_assert_int_equal(tctx, tdr->data.data[0], 0x32, "data incorrect");
-	torture_assert_int_equal(tctx, tdr->data.data[1], 0x0F, "data incorrect");
-	return true;
-}
-
-static bool test_pull_uint16(struct torture_context *tctx)
-{
-	uint8_t d[2] = { 782 & 0xFF, (782 & 0xFF00) / 0x100 };
-	uint16_t l;
-	struct tdr_pull *tdr = tdr_pull_init(tctx, lp_iconv_convenience(tctx->lp_ctx));
-	tdr->data.data = d;
-	tdr->data.length = 2;
-	tdr->offset = 0;
-	tdr->flags = 0;
-	torture_assert_ntstatus_ok(tctx, tdr_pull_uint16(tdr, tctx, &l), 
-							   "pull failed");
-	torture_assert_int_equal(tctx, 2, tdr->offset, "offset invalid");
-	torture_assert_int_equal(tctx, 782, l, "right int read");
-	return true;
-}
-
-static bool test_push_uint32(struct torture_context *tctx)
-{
-	uint32_t v = 0x100F32;
-	struct tdr_push *tdr = tdr_push_init(tctx, lp_iconv_convenience(tctx->lp_ctx));
-
-	torture_assert_ntstatus_ok(tctx, tdr_push_uint32(tdr, &v), "push failed");
-	torture_assert_int_equal(tctx, tdr->data.length, 4, "length incorrect");
-	torture_assert_int_equal(tctx, tdr->data.data[0], 0x32, "data incorrect");
-	torture_assert_int_equal(tctx, tdr->data.data[1], 0x0F, "data incorrect");
-	torture_assert_int_equal(tctx, tdr->data.data[2], 0x10, "data incorrect");
-	torture_assert_int_equal(tctx, tdr->data.data[3], 0x00, "data incorrect");
-	return true;
-}
-
-static bool test_pull_uint32(struct torture_context *tctx)
-{
-	uint8_t d[4] = { 782 & 0xFF, (782 & 0xFF00) / 0x100, 0, 0 };
-	uint32_t l;
-	struct tdr_pull *tdr = tdr_pull_init(tctx, lp_iconv_convenience(tctx->lp_ctx));
-	tdr->data.data = d;
-	tdr->data.length = 4;
-	tdr->offset = 0;
-	tdr->flags = 0;
-	torture_assert_ntstatus_ok(tctx, tdr_pull_uint32(tdr, tctx, &l), 
-							   "pull failed");
-	torture_assert_int_equal(tctx, 4, tdr->offset, "offset invalid");
-	torture_assert_int_equal(tctx, 782, l, "right int read");
-	return true;
-}
-
-static bool test_pull_charset(struct torture_context *tctx)
-{
-	struct tdr_pull *tdr = tdr_pull_init(tctx, lp_iconv_convenience(tctx->lp_ctx));
-	const char *l = NULL;
-	tdr->data.data = (uint8_t *)talloc_strdup(tctx, "bla");
-	tdr->data.length = 4;
-	tdr->offset = 0;
-	tdr->flags = 0;
-	torture_assert_ntstatus_ok(tctx, tdr_pull_charset(tdr, tctx, &l, -1, 1, CH_DOS), 
-							   "pull failed");
-	torture_assert_int_equal(tctx, 4, tdr->offset, "offset invalid");
-	torture_assert_str_equal(tctx, "bla", l, "right int read");
-
-	tdr->offset = 0;
-	torture_assert_ntstatus_ok(tctx, tdr_pull_charset(tdr, tctx, &l, 2, 1, CH_UNIX), 
-							   "pull failed");
-	torture_assert_int_equal(tctx, 2, tdr->offset, "offset invalid");
-	torture_assert_str_equal(tctx, "bl", l, "right int read");
-
-	return true;
-}
-
-static bool test_pull_charset_empty(struct torture_context *tctx)
-{
-	struct tdr_pull *tdr = tdr_pull_init(tctx, lp_iconv_convenience(tctx->lp_ctx));
-	const char *l = NULL;
-	tdr->data.data = (uint8_t *)talloc_strdup(tctx, "bla");
-	tdr->data.length = 4;
-	tdr->offset = 0;
-	tdr->flags = 0;
-	torture_assert_ntstatus_ok(tctx, tdr_pull_charset(tdr, tctx, &l, 0, 1, CH_DOS), 
-							   "pull failed");
-	torture_assert_int_equal(tctx, 0, tdr->offset, "offset invalid");
-	torture_assert_str_equal(tctx, "", l, "right string read");
-
-	return true;
-}
-
-
-
-static bool test_push_charset(struct torture_context *tctx)
-{
-	const char *l = "bloe";
-	struct tdr_push *tdr = tdr_push_init(tctx, lp_iconv_convenience(tctx->lp_ctx));
-	torture_assert_ntstatus_ok(tctx, tdr_push_charset(tdr, &l, 4, 1, CH_UTF8), 
-							   "push failed");
-	torture_assert_int_equal(tctx, 4, tdr->data.length, "offset invalid");
-	torture_assert(tctx, strcmp("bloe", (const char *)tdr->data.data) == 0, "right string push");
-
-	torture_assert_ntstatus_ok(tctx, tdr_push_charset(tdr, &l, -1, 1, CH_UTF8), 
-							   "push failed");
-	torture_assert_int_equal(tctx, 9, tdr->data.length, "offset invalid");
-	torture_assert_str_equal(tctx, "bloe", (const char *)tdr->data.data+4, "right string read");
-
-	return true;
-}
-
-struct torture_suite *torture_local_tdr(TALLOC_CTX *mem_ctx)
-{
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "TDR");
-
-	torture_suite_add_simple_test(suite, "pull_uint8", test_pull_uint8);
-	torture_suite_add_simple_test(suite, "push_uint8", test_push_uint8);
-	
-	torture_suite_add_simple_test(suite, "pull_uint16", test_pull_uint16);
-	torture_suite_add_simple_test(suite, "push_uint16", test_push_uint16);
-
-	torture_suite_add_simple_test(suite, "pull_uint32", test_pull_uint32);
-	torture_suite_add_simple_test(suite, "push_uint32", test_push_uint32);
-
-	torture_suite_add_simple_test(suite, "pull_charset", test_pull_charset);
-	torture_suite_add_simple_test(suite, "pull_charset", test_pull_charset_empty);
-	torture_suite_add_simple_test(suite, "push_charset", test_push_charset);
-
-	return suite;
-}
diff --git a/source4/main.mk b/source4/main.mk
index ee2018fb694..8ea9727ed3b 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -20,7 +20,7 @@ mkinclude ../lib/socket_wrapper/config.mk
 mkinclude ../lib/nss_wrapper/config.mk
 mkinclude lib/stream/config.mk
 mkinclude ../lib/util/config.mk
-mkinclude lib/tdr/config.mk
+mkinclude ../lib/tdr/config.mk
 mkinclude ../lib/crypto/config.mk
 mkinclude ../lib/torture/config.mk
 mkinclude lib/basic.mk
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 36f4f08072a..967e545225a 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -44,7 +44,7 @@ TORTURE_LOCAL_OBJ_FILES = \
 		$(torturesrcdir)/../../lib/compression/testsuite.o \
 		$(torturesrcdir)/../../lib/util/charset/tests/charset.o \
 		$(torturesrcdir)/../libcli/security/tests/sddl.o \
-		$(torturesrcdir)/../lib/tdr/testsuite.o \
+		$(libtdrsrcdir)/testsuite.o \
 		$(torturesrcdir)/../../lib/tevent/testsuite.o \
 		$(torturesrcdir)/../param/tests/share.o \
 		$(torturesrcdir)/../param/tests/loadparm.o \