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

13 files changed, 20 insertions, 17 deletions

diff --git a/source4/lib/tdr/TODO b/lib/tdr/TODO
index 5093afd438..5093afd438 100644
--- a/source4/lib/tdr/TODO
+++ b/lib/tdr/TODO
diff --git a/source4/lib/tdr/config.mk b/lib/tdr/config.mk
index 07506ec647..07506ec647 100644
--- a/source4/lib/tdr/config.mk
+++ b/lib/tdr/config.mk
diff --git a/source4/lib/tdr/tdr.c b/lib/tdr/tdr.c
index 8b62ea0c2b..293436ed5e 100644
--- a/source4/lib/tdr/tdr.c
+++ b/lib/tdr/tdr.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "system/network.h"
-#include "tdr/tdr.h"
+#include "lib/tdr/tdr.h"
 
 #define TDR_BASE_MARSHALL_SIZE 1024
 
diff --git a/source4/lib/tdr/tdr.h b/lib/tdr/tdr.h
index c983cd35c1..c983cd35c1 100644
--- a/source4/lib/tdr/tdr.h
+++ b/lib/tdr/tdr.h
diff --git a/source4/lib/tdr/testsuite.c b/lib/tdr/testsuite.c
index 44c5810f90..36bb164a9a 100644
--- a/source4/lib/tdr/testsuite.c
+++ b/lib/tdr/testsuite.c
@@ -21,12 +21,11 @@
 #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));
+	struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
 
 	torture_assert_ntstatus_ok(tctx, tdr_push_uint8(tdr, &v), "push failed");
 	torture_assert_int_equal(tctx, tdr->data.length, 1, "length incorrect");
@@ -38,7 +37,7 @@ 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));
+	struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
 	tdr->data.data = &d;
 	tdr->data.length = 1;
 	tdr->offset = 0;
@@ -53,7 +52,7 @@ static bool test_pull_uint8(struct torture_context *tctx)
 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));
+	struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
 
 	torture_assert_ntstatus_ok(tctx, tdr_push_uint16(tdr, &v), "push failed");
 	torture_assert_int_equal(tctx, tdr->data.length, 2, "length incorrect");
@@ -66,7 +65,7 @@ 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));
+	struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
 	tdr->data.data = d;
 	tdr->data.length = 2;
 	tdr->offset = 0;
@@ -81,7 +80,7 @@ static bool test_pull_uint16(struct torture_context *tctx)
 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));
+	struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
 
 	torture_assert_ntstatus_ok(tctx, tdr_push_uint32(tdr, &v), "push failed");
 	torture_assert_int_equal(tctx, tdr->data.length, 4, "length incorrect");
@@ -96,7 +95,7 @@ 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));
+	struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
 	tdr->data.data = d;
 	tdr->data.length = 4;
 	tdr->offset = 0;
@@ -110,7 +109,7 @@ static bool test_pull_uint32(struct torture_context *tctx)
 
 static bool test_pull_charset(struct torture_context *tctx)
 {
-	struct tdr_pull *tdr = tdr_pull_init(tctx, lp_iconv_convenience(tctx->lp_ctx));
+	struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
 	const char *l = NULL;
 	tdr->data.data = (uint8_t *)talloc_strdup(tctx, "bla");
 	tdr->data.length = 4;
@@ -132,7 +131,7 @@ static bool test_pull_charset(struct torture_context *tctx)
 
 static bool test_pull_charset_empty(struct torture_context *tctx)
 {
-	struct tdr_pull *tdr = tdr_pull_init(tctx, lp_iconv_convenience(tctx->lp_ctx));
+	struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
 	const char *l = NULL;
 	tdr->data.data = (uint8_t *)talloc_strdup(tctx, "bla");
 	tdr->data.length = 4;
@@ -151,7 +150,7 @@ static bool test_pull_charset_empty(struct torture_context *tctx)
 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));
+	struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
 	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");
diff --git a/lib/util/fault.m4 b/lib/util/fault.m4
index da077af31d..bac553a158 100644
--- a/lib/util/fault.m4
+++ b/lib/util/fault.m4
@@ -8,6 +8,7 @@ if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x
 	EXECINFO_CFLAGS="$CFLAGS"
 	EXECINFO_CPPFLAGS="$CPPFLAGS"
 	EXECINFO_LDFLAGS="$LDFLAGS"
+	LIB_REMOVE_USR_LIB(EXECINFO_LDFLAGS)
 else
 	SMB_ENABLE(EXECINFO,NO)
 fi
diff --git a/pidl/lib/Parse/Pidl/Samba4/TDR.pm b/pidl/lib/Parse/Pidl/Samba4/TDR.pm
index 568dff5adf..a6b74a0ba4 100644
--- a/pidl/lib/Parse/Pidl/Samba4/TDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/TDR.pm
@@ -271,7 +271,7 @@ sub Parser($$$$)
 	$self->pidl("");
 	$self->pidl_hdr("/* autogenerated by pidl */");
 	$self->pidl_hdr("#include \"$baseheader\"");
-	$self->pidl_hdr(choose_header("tdr/tdr.h", "tdr.h"));
+	$self->pidl_hdr(choose_header("lib/tdr/tdr.h", "tdr.h"));
 	$self->pidl_hdr("");
 
 	foreach (@$idl) { $self->ParserInterface($_) if ($_->{TYPE} eq "INTERFACE"); }	
diff --git a/source3/samba4.mk b/source3/samba4.mk
index 10e3f76bbf..7e7690aadf 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -89,7 +89,7 @@ socketwrappersrcdir := $(samba4srcdir)/../lib/socket_wrapper
 nsswrappersrcdir := $(samba4srcdir)/../lib/nss_wrapper
 libstreamsrcdir := $(samba4srcdir)/lib/stream
 libutilsrcdir := $(samba4srcdir)/../lib/util
-libtdrsrcdir := $(samba4srcdir)/lib/tdr
+libtdrsrcdir := ../lib/tdr
 libcryptosrcdir := $(samba4srcdir)/../lib/crypto
 libtorturesrcdir := ../lib/torture
 libcompressionsrcdir := $(samba4srcdir)/../lib/compression
diff --git a/source4/Makefile b/source4/Makefile
index 15b1b8ba40..c42f0ba9ff 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 a271a9f6fe..fb9ee58c60 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 ffdf92f784..6860e56e7f 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/main.mk b/source4/main.mk
index ee2018fb69..8ea9727ed3 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 36f4f08072..967e545225 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 \