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, 26 deletions

diff --git a/source4/pidl/tests/ndr_deprecations.pl b/source4/pidl/tests/ndr_deprecations.pl
deleted file mode 100755
index 86828e5982..0000000000
--- a/source4/pidl/tests/ndr_deprecations.pl
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/perl
-# (C) 2007 Jelmer Vernooij <jelmer@samba.org>
-# Published under the GNU General Public License
-use strict;
-use warnings;
-
-use Test::More tests => 1;
-use FindBin qw($RealBin);
-use lib "$RealBin";
-use Util;
-use Parse::Pidl::Util qw(MyDumper);
-use Parse::Pidl::NDR qw(ValidElement);
-
-# Case 1
-
-my $e = {
-	'FILE' => 'foo.idl',
-	'NAME' => 'v',
-	'PROPERTIES' => {"subcontext" => 1},
-	'POINTERS' => 0,
-	'TYPE' => 'uint8',
-	'PARENT' => { TYPE => 'STRUCT' },
-	'LINE' => 42 };
-
-test_warnings("foo.idl:42: subcontext() is deprecated. Use represent_as() or transmit_as() instead\n", 
-	sub { ValidElement($e); });