Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
	source4/lib/registry/ldb.c
	source4/rpc_server/winreg/rpc_winreg.c

1 files changed, 0 insertions, 90 deletions

diff --git a/source4/pidl/tests/ndr_string.pl b/source4/pidl/tests/ndr_string.pl
deleted file mode 100755
index 2f2d941665..0000000000
--- a/source4/pidl/tests/ndr_string.pl
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/perl
-# String tests for pidl
-# (C) 2005 Jelmer Vernooij <jelmer@samba.org>
-# Published under the GNU General Public License
-use strict;
-
-use Test::More tests => 3 * 8;
-use FindBin qw($RealBin);
-use lib "$RealBin";
-use Util qw(test_samba4_ndr);
-
-test_samba4_ndr("string-pull-empty", 
-' [public] void TestString([in,flag(STR_ASCII|LIBNDR_FLAG_STR_SIZE4)] string data);',
-'
-	uint8_t data[] = { 0x00, 0x00, 0x00, 0x00 };
-	DATA_BLOB b = { data, 4 };
-	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;
-
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_TestString(ndr, NDR_IN, &r)))
-		return 1;
-	
-	if (r.in.data == NULL)
-		return 2;
-
-	if (r.in.data[0] != 0)
-		return 3;
-');
-
-test_samba4_ndr("string-ascii-pull", 
-'
-	[public] void TestString([in,flag(STR_ASCII|LIBNDR_FLAG_STR_SIZE4)] string data);
-',
-'
-	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,
-		smb_iconv_convenience_init(NULL, "ASCII", "UTF8", true));
-	struct TestString r;
-	r.in.data = NULL;
-
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_TestString(ndr, NDR_IN, &r)))
-		return 1;
-	
-	if (r.in.data == NULL)
-		return 2;
-
-	if (strncmp(r.in.data, "foo", 3) != 0)
-		return 3;
-
-	if (r.in.data[4] != 0)
-		return 4;
-');
-
-SKIP: {
-	skip "doesn't seem to work yet", 8;
-
-test_samba4_ndr("string-out", 
-'
-	[public] void TestString([out,string,charset(UNIX)] uint8 **data);
-',
-'
-	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,
-		smb_iconv_convenience_init(NULL, "ASCII", "UTF8", true));
-	struct TestString r;
-	char *str = NULL;
-	r.out.data = &str;
-
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_TestString(ndr, NDR_IN, &r)))
-		return 1;
-
-	if (r.out.data == NULL)
-		return 2;
-
-	if (*r.out.data == NULL)
-		return 3;
-
-	if (strncmp(r.out.data, "foo", 3) != 0)
-		return 4;
-
-	if (r.out.data[4] != 0)
-		return 5;
-');
-}