r12622: Move table.c prototypes to seperate header to prevent circular dependencies

with proto.h

diff --git a/source/lib/com/dcom/main.c b/source/lib/com/dcom/main.c
index 9c18756da6911a0fae891a86062fef685f2c9b8e..d69a8f6a32148472071852ad45738e825723a5b6 100644 (file)
--- a/source/lib/com/dcom/main.c
+++ b/source/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/source/librpc/config.mk b/source/librpc/config.mk
index 03367bdf1748734f685aa7c863562a6c7e27b90b..dc40b692711b79424ab819e3e43319c4576f47cb 100644 (file)
--- a/source/librpc/config.mk
+++ b/source/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/source/librpc/rpc/table.c b/source/librpc/rpc/table.c
index 9b5cf8ff80801d36f2ca3d3313da05be9d45a3b7..14600a779f932e2645a8f7e41cfdb29a025689db 100644 (file)
--- a/source/librpc/rpc/table.c
+++ b/source/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/source/librpc/tables.pl b/source/librpc/tables.pl
index 7ef1dbd14af0451ad2e1d74ae3cb345c9280df42..462ef19e0823f65dd6bcebba7eca85572a5c2755 100644 (file)
--- a/source/librpc/tables.pl
+++ b/source/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/source/rpc_server/remote/dcesrv_remote.c b/source/rpc_server/remote/dcesrv_remote.c
index f7de3031ceae8c5355b453afe7d4dba996050111..4517847b74c3b2b1c10debf72a71b796e722b5a3 100644 (file)
--- a/source/rpc_server/remote/dcesrv_remote.c
+++ b/source/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/source/scripting/ejs/smbcalls_rpc.c b/source/scripting/ejs/smbcalls_rpc.c
index a104f0eb16c8f624df380659fd1074b6991a30ad..4527f7385a2fd77b4f7065c0f5dbb6e0be72569b 100644 (file)
--- a/source/scripting/ejs/smbcalls_rpc.c
+++ b/source/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/source/torture/rpc/autoidl.c b/source/torture/rpc/autoidl.c
index 4abe9f415eb1c914e7283b7dca77292c4ad1f80e..891309224396940e9070ecc266ba7ac2ce1f83df 100644 (file)
--- a/source/torture/rpc/autoidl.c
+++ b/source/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/source/torture/rpc/countcalls.c b/source/torture/rpc/countcalls.c
index 0441191ebf9ca698247f93c0ce360276482fdee5..bf0b1cd6354ce6d538e92d458c4e89bbeb2b51a8 100644 (file)
--- a/source/torture/rpc/countcalls.c
+++ b/source/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/source/torture/rpc/epmapper.c b/source/torture/rpc/epmapper.c
index bb4fbb41bcd57f71d99cfddad235c7551d7cd5f6..f7fa75d559d17f44cb3a05f22c7785d2a4598048 100644 (file)
--- a/source/torture/rpc/epmapper.c
+++ b/source/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/source/torture/rpc/mgmt.c b/source/torture/rpc/mgmt.c
index 4ac5fa390cf5a683b70ce421fc8e23025f55022f..e216ffe725673e6f399be4ce8cb2bebac7ebf226 100644 (file)
--- a/source/torture/rpc/mgmt.c
+++ b/source/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/source/torture/rpc/scanner.c b/source/torture/rpc/scanner.c
index 9ed414e2f4413ec9dba266ea42334b9acafa4123..0916dafc2c474ba018a01899f620bbe136a75087 100644 (file)
--- a/source/torture/rpc/scanner.c
+++ b/source/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/source/torture/torture.c b/source/torture/torture.c
index 82fda0d4ff58dda89ae639f0d0a6e7d89305fe69..ff1a72799b367c945028fbb27f1f354318057979 100644 (file)
--- a/source/torture/torture.c
+++ b/source/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/source/utils/ndrdump.c b/source/utils/ndrdump.c
index 497726279b978d863765291d0f87d8c09bd0823d..3c3e7f733bdadb5349cdbc574dc25897cd676fdf 100644 (file)
--- a/source/utils/ndrdump.c
+++ b/source/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,