From 046a54f96394fe49226ab2b48fdeb7c07937ea57 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 30 Dec 2005 23:18:27 +0000
Subject: r12622: Move table.c prototypes to seperate header to prevent
 circular dependencies with proto.h (This used to be commit
 9e0ba380374db028358158b9e4457dd930b5ab13)

---
 source4/lib/com/dcom/main.c               | 1 +
 source4/librpc/config.mk                  | 1 +
 source4/librpc/rpc/table.c                | 1 +
 source4/librpc/tables.pl                  | 1 +
 source4/rpc_server/remote/dcesrv_remote.c | 1 +
 source4/scripting/ejs/smbcalls_rpc.c      | 1 +
 source4/torture/rpc/autoidl.c             | 1 +
 source4/torture/rpc/countcalls.c          | 1 +
 source4/torture/rpc/epmapper.c            | 1 +
 source4/torture/rpc/mgmt.c                | 1 +
 source4/torture/rpc/scanner.c             | 1 +
 source4/torture/torture.c                 | 1 +
 source4/utils/ndrdump.c                   | 1 +
 13 files changed, 13 insertions(+)

(limited to 'source4')

diff --git a/source4/lib/com/dcom/main.c b/source4/lib/com/dcom/main.c
index 9c18756da6..d69a8f6a32 100644
--- a/source4/lib/com/dcom/main.c
+++ b/source4/lib/com/dcom/main.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/ndr_remact.h"
 #include "librpc/gen_ndr/com_dcom.h"
 #include "lib/com/dcom/dcom.h"
+#include "librpc/rpc/dcerpc_table.h"
 
 #define DCOM_NEGOTIATED_PROTOCOLS { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB, EPM_PROTOCOL_NCALRPC }
 
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 03367bdf17..dc40b69271 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -304,6 +304,7 @@ librpc/gen_ndr/tables.c: librpc/gen_ndr/ndr_*.h
 
 [SUBSYSTEM::NDR_ALL]
 OBJ_FILES = rpc/table.o gen_ndr/tables.o
+PRIVATE_PROTO_HEADER = rpc/dcerpc_table.h
 REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV NDR_ECHO NDR_DCERPC NDR_EXCHANGE \
 	NDR_DSBACKUP NDR_EFS NDR_MISC NDR_LSA NDR_DFS NDR_DRSUAPI \
 	NDR_POLICYAGENT NDR_UNIXINFO NDR_SAMR NDR_SPOOLSS NDR_WKSSVC NDR_SRVSVC NDR_ATSVC \
diff --git a/source4/librpc/rpc/table.c b/source4/librpc/rpc/table.c
index 9b5cf8ff80..14600a779f 100644
--- a/source4/librpc/rpc/table.c
+++ b/source4/librpc/rpc/table.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "librpc/rpc/dcerpc_table.h"
 
 struct dcerpc_interface_list *dcerpc_pipes = NULL;
 
diff --git a/source4/librpc/tables.pl b/source4/librpc/tables.pl
index 7ef1dbd14a..462ef19e08 100644
--- a/source4/librpc/tables.pl
+++ b/source4/librpc/tables.pl
@@ -74,6 +74,7 @@ print TABLEC <<EOF;
 /* Automatically generated by tables.pl. DO NOT EDIT */
 
 #include "includes.h"
+#include "librpc/rpc/dcerpc_table.h"
 EOF
 
 process_file($_) foreach (@ARGV);
diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c
index f7de3031ce..4517847b74 100644
--- a/source4/rpc_server/remote/dcesrv_remote.c
+++ b/source4/rpc_server/remote/dcesrv_remote.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "rpc_server/dcerpc_server.h"
 #include "auth/auth.h"
+#include "librpc/rpc/dcerpc_table.h"
 
 
 struct dcesrv_remote_private {
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index a104f0eb16..4527f7385a 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -29,6 +29,7 @@
 #include "scripting/ejs/ejsrpc.h"
 #include "dlinklist.h"
 #include "lib/events/events.h"
+#include "librpc/rpc/dcerpc_table.h"
 
 /*
   state of a irpc 'connection'
diff --git a/source4/torture/rpc/autoidl.c b/source4/torture/rpc/autoidl.c
index 4abe9f415e..8913092243 100644
--- a/source4/torture/rpc/autoidl.c
+++ b/source4/torture/rpc/autoidl.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/rpc/dcerpc_table.h"
 
 
 #if 1
diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c
index 0441191ebf..bf0b1cd635 100644
--- a/source4/torture/rpc/countcalls.c
+++ b/source4/torture/rpc/countcalls.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/rpc/dcerpc_table.h"
 
 
 BOOL torture_rpc_countcalls(void)
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index bb4fbb41bc..f7fa75d559 100644
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/rpc/dcerpc_table.h"
 
 
 /*
diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index 4ac5fa390c..e216ffe725 100644
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_mgmt.h"
 #include "auth/gensec/gensec.h"
+#include "librpc/rpc/dcerpc_table.h"
 
 
 /*
diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c
index 9ed414e2f4..0916dafc2c 100644
--- a/source4/torture/rpc/scanner.c
+++ b/source4/torture/rpc/scanner.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_mgmt.h"
+#include "librpc/rpc/dcerpc_table.h"
 
 /*
   work out how many calls there are for an interface
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 82fda0d4ff..ff1a72799b 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -25,6 +25,7 @@
 #include "system/wait.h"
 #include "system/filesys.h"
 #include "ioctl.h"
+#include "librpc/rpc/dcerpc_table.h"
 
 int torture_nprocs=4;
 int torture_numops=10;
diff --git a/source4/utils/ndrdump.c b/source4/utils/ndrdump.c
index 497726279b..3c3e7f733b 100644
--- a/source4/utils/ndrdump.c
+++ b/source4/utils/ndrdump.c
@@ -22,6 +22,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "system/iconv.h"
 #include "system/filesys.h"
+#include "librpc/rpc/dcerpc_table.h"
 
 static const struct dcerpc_interface_call *find_function(
 	const struct dcerpc_interface_table *p,
-- 
cgit