r26444: Fix pidl tests.

(This used to be commit bc643f1014cef7f0bc66ad0edfa22395c69b8352)

9 files changed, 46 insertions, 43 deletions

diff --git a/source4/pidl/tests/ndr_align.pl b/source4/pidl/tests/ndr_align.pl
index 1f4a0da9bb..cc089eaa1f 100755
--- a/source4/pidl/tests/ndr_align.pl
+++ b/source4/pidl/tests/ndr_align.pl
@@ -16,7 +16,7 @@ test_samba4_ndr('align-uint8-uint16',
 	} bla;
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct bla r;
 	uint8_t expected[] = { 0x0D, 0x00, 0xef, 0xbe };
 	DATA_BLOB expected_blob = { expected, 4 };
@@ -41,7 +41,7 @@ test_samba4_ndr('align-uint8-uint32',
 	} bla;
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct bla r;
 	uint8_t expected[] = { 0x0D, 0x00, 0x00, 0x00, 0xef, 0xbe, 0xef, 0xbe };
 	DATA_BLOB expected_blob = { expected, 8 };
@@ -67,7 +67,7 @@ test_samba4_ndr('align-uint8-hyper',
 	} bla;
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct bla r;
 	uint8_t expected[] = { 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 			       0xef, 0xbe, 0xef, 0xbe, 0xef, 0xbe, 0xef, 0xbe };
@@ -93,7 +93,7 @@ test_samba4_ndr('noalignflag-uint8-uint16',
 	} bla;
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct bla r;
 	uint8_t expected[] = { 0x0D, 0xef, 0xbe };
 	DATA_BLOB expected_blob = { expected, 3 };
@@ -121,7 +121,7 @@ test_samba4_ndr('align-blob-align2',
 	} blie;
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct blie r;
 	uint8_t data[] = { 0x01, 0x02 };
 	uint8_t expected[] = { 0x0D, 0x00, 0x0E };
diff --git a/source4/pidl/tests/ndr_alloc.pl b/source4/pidl/tests/ndr_alloc.pl
index e967bb7cdb..399fbd21d6 100755
--- a/source4/pidl/tests/ndr_alloc.pl
+++ b/source4/pidl/tests/ndr_alloc.pl
@@ -20,7 +20,7 @@ test_samba4_ndr("alloc-scalar",
 ','
 	uint8_t data[] = { 0xde, 0xad, 0xbe, 0xef, 0x03 };
 	DATA_BLOB b = { data, 5 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL, NULL);
 	struct TestAlloc r;
 
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_TestAlloc(ndr, NDR_IN, &r)))
@@ -44,7 +44,7 @@ test_samba4_ndr("alloc-buffer",
 ','
 	uint8_t data[] = { 0xde, 0xad, 0xbe, 0xef, 0x03 };
 	DATA_BLOB b = { data, 5 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL, NULL);
 	struct TestAlloc r;
 
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_TestAlloc(ndr, NDR_IN, &r)))
@@ -65,7 +65,7 @@ test_samba4_ndr("ref-noalloc-null",
 ','
 	uint8_t data[] = { 0x03 };
 	DATA_BLOB b = { data, 1 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL, NULL);
 	struct TestAlloc r;
 	r.in.t = NULL;
 
@@ -81,7 +81,7 @@ test_samba4_ndr("ref-noalloc",
 ','
 	uint8_t data[] = { 0x03 };
 	DATA_BLOB b = { data, 1 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL, NULL);
 	struct TestAlloc r;
 	uint8_t x;
 	r.in.t = &x;
@@ -101,7 +101,7 @@ test_samba4_ndr("ref-alloc",
 ','
 	uint8_t data[] = { 0x03 };
 	DATA_BLOB b = { data, 1 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL, NULL);
 	struct TestAlloc r;
 	ndr->flags |= LIBNDR_FLAG_REF_ALLOC;
 	r.in.t = NULL;
diff --git a/source4/pidl/tests/ndr_array.pl b/source4/pidl/tests/ndr_array.pl
index 174d702c07..2a6b5bbd57 100755
--- a/source4/pidl/tests/ndr_array.pl
+++ b/source4/pidl/tests/ndr_array.pl
@@ -23,7 +23,7 @@ test_samba4_ndr(
 
 	b.data = data;
 	b.length = 10;
-	ndr = ndr_pull_init_blob(&b, mem_ctx);
+	ndr = ndr_pull_init_blob(&b, mem_ctx, NULL);
 
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_Test(ndr, NDR_IN, &r)))
 		return 1;
diff --git a/source4/pidl/tests/ndr_fullptr.pl b/source4/pidl/tests/ndr_fullptr.pl
index 27d4e69447..cc6fca7ab3 100755
--- a/source4/pidl/tests/ndr_fullptr.pl
+++ b/source4/pidl/tests/ndr_fullptr.pl
@@ -17,7 +17,7 @@ test_samba4_ndr("fullptr-push-dup",
 	[public] uint16 echo_TestFull([in,ptr] uint32 *x, [in,ptr] uint32 *y);
 ',
 '
-	struct ndr_push *ndr = ndr_push_init();
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	uint32_t v = 13;
 	struct echo_TestFull r;
 	r.in.x = &v; 
diff --git a/source4/pidl/tests/ndr_refptr.pl b/source4/pidl/tests/ndr_refptr.pl
index 0fb4810285..d5dd83957a 100755
--- a/source4/pidl/tests/ndr_refptr.pl
+++ b/source4/pidl/tests/ndr_refptr.pl
@@ -18,7 +18,7 @@ test_samba4_ndr("noptr-push",
 	[public] uint16 echo_TestRef([in] xstruct foo);
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	uint16_t v = 13;
 	struct echo_TestRef r;
 	r.in.foo.x = v; 
@@ -48,7 +48,7 @@ test_samba4_ndr("ptr-embedded-push",
 ',
 '
 	uint16_t v = 13;
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	r.in.foo.x = &v; 
 
@@ -74,7 +74,7 @@ test_samba4_ndr("ptr-embedded-push-null",
 	[public] uint16 echo_TestRef([in] xstruct foo);
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	r.in.foo.x = NULL; 
 
@@ -99,7 +99,7 @@ test_samba4_ndr("refptr-embedded-push",
 ',
 '
 	uint16_t v = 13;
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	r.in.foo.x = &v; 
 
@@ -126,7 +126,7 @@ test_samba4_ndr("refptr-embedded-push-null",
 	[public] uint16 echo_TestRef([in] xstruct foo);
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	r.in.foo.x = NULL; 
 
@@ -144,7 +144,7 @@ test_samba4_ndr("ptr-top-push",
 	[public] uint16 echo_TestRef([in] xstruct *foo);
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	struct xstruct s;
 	s.x = 13;
@@ -169,7 +169,7 @@ test_samba4_ndr("ptr-top-push-null",
 	[public] uint16 echo_TestRef([in] xstruct *foo);
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	r.in.foo = NULL;
 
@@ -189,7 +189,7 @@ test_samba4_ndr("refptr-top-push",
 	[public] uint16 echo_TestRef([in,ref] xstruct *foo);
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	struct xstruct s;
 	s.x = 13;
@@ -214,7 +214,7 @@ test_samba4_ndr("refptr-top-push-null",
 	[public] uint16 echo_TestRef([in,ref] xstruct *foo);
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	r.in.foo = NULL;
 
@@ -233,7 +233,7 @@ test_samba4_ndr("uniqueptr-top-push",
 	[public] uint16 echo_TestRef([in,unique] xstruct *foo);
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	struct xstruct s;
 	s.x = 13;
@@ -261,7 +261,7 @@ test_samba4_ndr("uniqueptr-top-push-null",
 	[public] uint16 echo_TestRef([in,unique] xstruct *foo);
 ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	r.in.foo = NULL;
 
@@ -288,7 +288,7 @@ test_samba4_ndr("ptr-top-out-pull",
 '
 	uint8_t data[] = { 0x0D, 0x00 };
 	DATA_BLOB b = { data, 2 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL, NULL);
 	struct xstruct s;
 	struct echo_TestRef r;
 
@@ -315,7 +315,7 @@ test_samba4_ndr("ptr-top-out-pull-null",
 '
 	uint8_t data[] = { 0x0D, 0x00 };
 	DATA_BLOB b = { data, 2 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL, NULL);
 	struct echo_TestRef r;
 
 	r.out.foo = NULL;
@@ -338,7 +338,7 @@ test_samba4_ndr("refptr-top-out-pull",
 '
 	uint8_t data[] = { 0x0D, 0x00 };
 	DATA_BLOB b = { data, 2 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL, NULL);
 	struct xstruct s;
 	struct echo_TestRef r;
 
@@ -365,7 +365,7 @@ test_samba4_ndr("refptr-top-out-pull-null",
 '
 	uint8_t data[] = { 0x0D, 0x00 };
 	DATA_BLOB b = { data, 2 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL, NULL);
 	struct echo_TestRef r;
 
 	r.out.foo = NULL;
@@ -381,7 +381,7 @@ test_samba4_ndr("ptr-top-push-double",
 '
 	[public] void echo_TestRef([in] uint16 **foo);
 ',
-'	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+'	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	uint16_t v = 13;
 	uint16_t *pv = &v;
@@ -408,7 +408,7 @@ test_samba4_ndr("ptr-top-push-double-sndnull",
 '
 	[public] void echo_TestRef([in] uint16 **foo);
 ',
-'	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+'	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	uint16_t *pv = NULL;
 	r.in.foo = &pv;
@@ -429,7 +429,7 @@ test_samba4_ndr("ptr-top-push-double-fstnull",
 '
 	[public] void echo_TestRef([in] uint16 **foo);
 ',
-'	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+'	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	r.in.foo = NULL;
 
@@ -445,7 +445,7 @@ test_samba4_ndr("refptr-top-push-double",
 '
 	[public] void echo_TestRef([in,ref] uint16 **foo);
 ',
-'	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+'	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	uint16_t v = 13;
 	uint16_t *pv = &v;
@@ -473,7 +473,7 @@ test_samba4_ndr("refptr-top-push-double-sndnull",
 '
 	[public] void echo_TestRef([in,ref] uint16 **foo);
 ',
-'	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+'	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	uint16_t *pv = NULL;
 	r.in.foo = &pv;
@@ -494,7 +494,7 @@ test_samba4_ndr("refptr-top-push-double-fstnull",
 '
 	[public] void echo_TestRef([in,ref] uint16 **foo);
 ',
-'	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+'	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	r.in.foo = NULL;
 
@@ -511,7 +511,7 @@ test_samba4_ndr("ignore-ptr",
 '
 	[public] void echo_TestRef([in,ignore] uint16 *foo, [in] uint16 *bar);
 ',
-'	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+'	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct echo_TestRef r;
 	uint16_t v = 10;
 	r.in.foo = &v; 
diff --git a/source4/pidl/tests/ndr_represent.pl b/source4/pidl/tests/ndr_represent.pl
index 8c52015642..2d65fb92b0 100755
--- a/source4/pidl/tests/ndr_represent.pl
+++ b/source4/pidl/tests/ndr_represent.pl
@@ -15,7 +15,7 @@ test_samba4_ndr('represent_as-simple',
 '
 	uint8_t expected[] = { 0x0D };
 	DATA_BLOB in_blob = { expected, 1 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&in_blob, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&in_blob, NULL, NULL);
 	struct bla r;
 
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r)))
@@ -46,7 +46,7 @@ test_samba4_ndr('transmit_as-simple',
 '
 	uint8_t expected[] = { 0x0D };
 	DATA_BLOB in_blob = { expected, 1 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&in_blob, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&in_blob, NULL, NULL);
 	struct bla r;
 
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_bla(ndr, NDR_SCALARS|NDR_BUFFERS, &r)))
diff --git a/source4/pidl/tests/ndr_simple.pl b/source4/pidl/tests/ndr_simple.pl
index e5e4197a4f..15e07d5693 100755
--- a/source4/pidl/tests/ndr_simple.pl
+++ b/source4/pidl/tests/ndr_simple.pl
@@ -18,7 +18,7 @@ test_samba4_ndr("simple", "void Test(); ",
 
 	b.data = data;
 	b.length = 1;
-	ndr = ndr_pull_init_blob(&b, mem_ctx);
+	ndr = ndr_pull_init_blob(&b, mem_ctx, NULL);
 
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_uint8(ndr, NDR_SCALARS, &result)))
 		return 1;
diff --git a/source4/pidl/tests/ndr_string.pl b/source4/pidl/tests/ndr_string.pl
index 834ef5a289..2f2d941665 100755
--- a/source4/pidl/tests/ndr_string.pl
+++ b/source4/pidl/tests/ndr_string.pl
@@ -14,7 +14,8 @@ test_samba4_ndr("string-pull-empty",
 '
 	uint8_t data[] = { 0x00, 0x00, 0x00, 0x00 };
 	DATA_BLOB b = { data, 4 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL, 
+		smb_iconv_convenience_init(NULL, "ASCII", "UTF8", true));
 	struct TestString r;
 	r.in.data = NULL;
 
@@ -36,7 +37,8 @@ test_samba4_ndr("string-ascii-pull",
 	uint8_t data[] = { 0x03, 0x00, 0x00, 0x00, 
 					   \'f\', \'o\', \'o\', 0 };
 	DATA_BLOB b = { data, 8 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL,
+		smb_iconv_convenience_init(NULL, "ASCII", "UTF8", true));
 	struct TestString r;
 	r.in.data = NULL;
 
@@ -64,7 +66,8 @@ test_samba4_ndr("string-out",
 	uint8_t data[] = { 0x03, 0x00, 0x00, 0x00, 
 					   \'f\', \'o\', \'o\', 0 };
 	DATA_BLOB b = { data, 8 };
-	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL);
+	struct ndr_pull *ndr = ndr_pull_init_blob(&b, NULL,
+		smb_iconv_convenience_init(NULL, "ASCII", "UTF8", true));
 	struct TestString r;
 	char *str = NULL;
 	r.out.data = &str;
diff --git a/source4/pidl/tests/ndr_tagtype.pl b/source4/pidl/tests/ndr_tagtype.pl
index 4d6bcb53af..3f9b717bfe 100755
--- a/source4/pidl/tests/ndr_tagtype.pl
+++ b/source4/pidl/tests/ndr_tagtype.pl
@@ -10,7 +10,7 @@ use Util qw(test_samba4_ndr);
 
 test_samba4_ndr('struct-notypedef', '[public] struct bla { uint8 x; }; ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct bla r;
 	uint8_t expected[] = { 0x0D };
 	DATA_BLOB expected_blob = { expected, 1 };
@@ -29,7 +29,7 @@ test_samba4_ndr('struct-notypedef', '[public] struct bla { uint8 x; }; ',
 test_samba4_ndr('struct-notypedef-used', '[public] struct bla { uint8 x; };
 	[public] void myfn([in] struct bla r); ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct myfn fn;
 	uint8_t expected[] = { 0x0D };
 	DATA_BLOB expected_blob = { expected, 1 };
@@ -49,7 +49,7 @@ test_samba4_ndr('struct-notypedef-used', '[public] struct bla { uint8 x; };
 test_samba4_ndr('struct-notypedef-embedded', 'struct bla { uint8 x; };
 	[public] struct myst { struct bla r; }; ',
 '
-	struct ndr_push *ndr = ndr_push_init_ctx(NULL);
+	struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
 	struct myst st;
 	uint8_t expected[] = { 0x0D };
 	DATA_BLOB expected_blob = { expected, 1 };