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

diff --git a/source4/librpc/tables.pl b/source4/librpc/tables.pl
deleted file mode 100644
index 04764f5fa0..0000000000
--- a/source4/librpc/tables.pl
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/perl -w
-
-###################################################
-# package to produce a table of all idl parsers
-# Copyright tridge@samba.org 2003
-# Copyright jelmer@samba.org 2005
-# released under the GNU GPL
-
-use strict;
-
-use Getopt::Long;
-use File::Basename;
-
-my $opt_output = 'librpc/gen_ndr/tables.c';
-my $opt_help  = 0;
-
-
-#########################################
-# display help text
-sub ShowHelp()
-{
-    print "
-           perl NDR interface table generator
-           Copyright (C) tridge\@samba.org
-
-           Usage: tables.pl [options] <idlfile>
-
-           \n";
-    exit(0);
-}
-
-# main program
-GetOptions (
-	    'help|h|?' => \$opt_help, 
-	    'output=s' => \$opt_output,
-	    );
-
-if ($opt_help) {
-    ShowHelp();
-    exit(0);
-}
-
-my $init_fns = "";
-
-###################################
-# extract table entries from 1 file
-sub process_file($)
-{
-	my $filename = shift;
-	open(FILE, $filename) || die "unable to open $filename\n";
-	my $found = 0;
-
-	while (my $line = <FILE>) {
-		if ($line =~ /extern const struct ndr_interface_table (\w+);/) {
-			$found = 1;
-			$init_fns.="\tstatus = ndr_table_register(&$1);\n";
-			$init_fns.="\tif (NT_STATUS_IS_ERR(status)) return status;\n\n";
-		}
-	}
-
-	if ($found) {
-		print "#include \"$filename\"\n";
-	}
-
-	close(FILE);
-}
-
-print <<EOF;
-
-/* Automatically generated by tables.pl. DO NOT EDIT */
-
-#include "includes.h"
-#include "librpc/ndr/libndr.h"
-#include "librpc/ndr/ndr_table.h"
-EOF
-
-process_file($_) foreach (@ARGV);
-
-print <<EOF;
-
-NTSTATUS ndr_table_register_builtin_tables(void)
-{
-	NTSTATUS status;
-
-$init_fns
-	
-	return NT_STATUS_OK;
-}
-EOF