r24552: merge from SAMBA_4_0:

rename dcerpc_interface_table -> ndr_interface_table
rename dcerpc_interface_list  -> ndr_interface_list

and move them to libndr.h

metze
(This used to be commit f57d23d0f1b1c7a435f3a4ad801e58519cc92a77)

diff --git a/source3/include/dcerpc.h b/source3/include/dcerpc.h
deleted file mode 100644 (file)
index a07b5c6..0000000
--- a/source3/include/dcerpc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* unused.  Stub to make the pidl generated NDR parsers compile */
-
-struct dcerpc_interface_table {
-        const char *name;
-        struct ndr_syntax_id syntax_id;
-        const char *helpstring;
-        uint32_t num_calls;
-        const struct ndr_interface_call *calls;
-        const struct ndr_interface_string_array *endpoints;
-        const struct ndr_interface_string_array *authservices;
-};
-
-struct dcerpc_interface_list {
-        struct dcerpc_interface_list *prev, *next;
-        const struct dcerpc_interface_table *table;
-};
-
-

diff --git a/source3/librpc/gen_ndr/ndr_dfs.c b/source3/librpc/gen_ndr/ndr_dfs.c
index 2f9fdeea319bc715db27aa495c3323e12e9cc3da..b841fb875eeddc9915e2bb94416b720807683cc0 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_dfs.c
+++ b/source3/librpc/gen_ndr/ndr_dfs.c
@@ -5328,7 +5328,7 @@ const struct ndr_interface_string_array netdfs_authservices = {
 };
 
 
-const struct dcerpc_interface_table dcerpc_table_netdfs = {
+const struct ndr_interface_table dcerpc_table_netdfs = {
        .name           = "netdfs",
        .syntax_id      = {
                {0x4fc742e0,0x4a10,0x11cf,{0x82,0x73},{0x00,0xaa,0x00,0x4a,0xe6,0x73}},

diff --git a/source3/librpc/gen_ndr/ndr_dfs.h b/source3/librpc/gen_ndr/ndr_dfs.h
index 3fab6e857deea8eee7e3a1952e04d0ee3ed2b4c2..7ae59f901b6d506329f20fbfa5d0ecbb8645ff50 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_dfs.h
+++ b/source3/librpc/gen_ndr/ndr_dfs.h
@@ -10,7 +10,7 @@
 #define DCERPC_NETDFS_VERSION 3.0
 #define DCERPC_NETDFS_NAME "netdfs"
 #define DCERPC_NETDFS_HELPSTRING "Settings for Microsoft Distributed File System"
-extern const struct dcerpc_interface_table dcerpc_table_netdfs;
+extern const struct ndr_interface_table dcerpc_table_netdfs;
 NTSTATUS dcerpc_server_netdfs_init(void);
 #define DCERPC_DFS_GETMANAGERVERSION (0x00)
 

diff --git a/source3/librpc/gen_ndr/ndr_echo.c b/source3/librpc/gen_ndr/ndr_echo.c
index f9659981046f101da2ef58584260015c385f1535..53a98139dd39e65e7dec34d6e05a60bd0c2848eb 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_echo.c
+++ b/source3/librpc/gen_ndr/ndr_echo.c
@@ -1445,7 +1445,7 @@ const struct ndr_interface_string_array rpcecho_authservices = {
 };
 
 
-const struct dcerpc_interface_table dcerpc_table_rpcecho = {
+const struct ndr_interface_table dcerpc_table_rpcecho = {
        .name           = "rpcecho",
        .syntax_id      = {
                {0x60a15ec5,0x4de8,0x11d7,{0xa6,0x37},{0x00,0x50,0x56,0xa2,0x01,0x82}},

diff --git a/source3/librpc/gen_ndr/ndr_echo.h b/source3/librpc/gen_ndr/ndr_echo.h
index 9c4603bc11e059f6832085bf7f0dcdabba06cc5e..8b6820cb2aff9e996be5a0bc764d5ee2434706be 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_echo.h
+++ b/source3/librpc/gen_ndr/ndr_echo.h
@@ -10,7 +10,7 @@
 #define DCERPC_RPCECHO_VERSION 1.0
 #define DCERPC_RPCECHO_NAME "rpcecho"
 #define DCERPC_RPCECHO_HELPSTRING "Simple echo pipe"
-extern const struct dcerpc_interface_table dcerpc_table_rpcecho;
+extern const struct ndr_interface_table dcerpc_table_rpcecho;
 NTSTATUS dcerpc_server_rpcecho_init(void);
 #define DCERPC_ECHO_ADDONE (0x00)
 

diff --git a/source3/librpc/gen_ndr/ndr_epmapper.c b/source3/librpc/gen_ndr/ndr_epmapper.c
index 23a3a6e437c7e47ec71a66f8fd167e112c628ee4..21e0901908d17eeea5c3a01eceba6403ba570afe 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_epmapper.c
+++ b/source3/librpc/gen_ndr/ndr_epmapper.c
@@ -2671,7 +2671,7 @@ const struct ndr_interface_string_array epmapper_authservices = {
 };
 
 
-const struct dcerpc_interface_table dcerpc_table_epmapper = {
+const struct ndr_interface_table dcerpc_table_epmapper = {
        .name           = "epmapper",
        .syntax_id      = {
                {0xe1af8308,0x5d1f,0x11c9,{0x91,0xa4},{0x08,0x00,0x2b,0x14,0xa0,0xfa}},

diff --git a/source3/librpc/gen_ndr/ndr_epmapper.h b/source3/librpc/gen_ndr/ndr_epmapper.h
index b8040f59eb73bc02d51dc31c1d8034a3f4b13459..a19fd8b47b1020cddb9a20eb3007b1c62ec32315 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_epmapper.h
+++ b/source3/librpc/gen_ndr/ndr_epmapper.h
@@ -10,7 +10,7 @@
 #define DCERPC_EPMAPPER_VERSION 3.0
 #define DCERPC_EPMAPPER_NAME "epmapper"
 #define DCERPC_EPMAPPER_HELPSTRING "EndPoint Mapper"
-extern const struct dcerpc_interface_table dcerpc_table_epmapper;
+extern const struct ndr_interface_table dcerpc_table_epmapper;
 NTSTATUS dcerpc_server_epmapper_init(void);
 #define DCERPC_EPM_INSERT (0x00)
 

diff --git a/source3/librpc/gen_ndr/ndr_eventlog.c b/source3/librpc/gen_ndr/ndr_eventlog.c
index fcd4c99400835d88192ee3035420b3b022e5df62..ad6aa1f0a8534642ee18b7684c09f43912a270ab 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_eventlog.c
+++ b/source3/librpc/gen_ndr/ndr_eventlog.c
@@ -1629,7 +1629,7 @@ const struct ndr_interface_string_array eventlog_authservices = {
 };
 
 
-const struct dcerpc_interface_table dcerpc_table_eventlog = {
+const struct ndr_interface_table dcerpc_table_eventlog = {
        .name           = "eventlog",
        .syntax_id      = {
                {0x82273fdc,0xe32a,0x18c3,{0x3f,0x78},{0x82,0x79,0x29,0xdc,0x23,0xea}},

diff --git a/source3/librpc/gen_ndr/ndr_eventlog.h b/source3/librpc/gen_ndr/ndr_eventlog.h
index da43bcf9fcfdca39855f308d5fe43e700f8ecd5c..5ccc5b53eea787ea92b22b1f32e70dbd873f7d34 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_eventlog.h
+++ b/source3/librpc/gen_ndr/ndr_eventlog.h
@@ -10,7 +10,7 @@
 #define DCERPC_EVENTLOG_VERSION 0.0
 #define DCERPC_EVENTLOG_NAME "eventlog"
 #define DCERPC_EVENTLOG_HELPSTRING "Event Logger"
-extern const struct dcerpc_interface_table dcerpc_table_eventlog;
+extern const struct ndr_interface_table dcerpc_table_eventlog;
 NTSTATUS dcerpc_server_eventlog_init(void);
 #define DCERPC_EVENTLOG_CLEAREVENTLOGW (0x00)
 

diff --git a/source3/librpc/gen_ndr/ndr_initshutdown.c b/source3/librpc/gen_ndr/ndr_initshutdown.c
index 882fc487bf3e420a59ab05e0c5aff60d38b4d0fe..f834a6633240aa046a1cf46f067910f996765871 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_initshutdown.c
+++ b/source3/librpc/gen_ndr/ndr_initshutdown.c
@@ -414,7 +414,7 @@ const struct ndr_interface_string_array initshutdown_authservices = {
 };
 
 
-const struct dcerpc_interface_table dcerpc_table_initshutdown = {
+const struct ndr_interface_table dcerpc_table_initshutdown = {
        .name           = "initshutdown",
        .syntax_id      = {
                {0x894de0c0,0x0d55,0x11d3,{0xa3,0x22},{0x00,0xc0,0x4f,0xa3,0x21,0xa1}},

diff --git a/source3/librpc/gen_ndr/ndr_initshutdown.h b/source3/librpc/gen_ndr/ndr_initshutdown.h
index 0df80cb707044e389bddaddbf88254bde27605f4..c3851a910ae8a3fe4d7eb749e76619ba0a1b7409 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_initshutdown.h
+++ b/source3/librpc/gen_ndr/ndr_initshutdown.h
@@ -10,7 +10,7 @@
 #define DCERPC_INITSHUTDOWN_VERSION 1.0
 #define DCERPC_INITSHUTDOWN_NAME "initshutdown"
 #define DCERPC_INITSHUTDOWN_HELPSTRING "Init shutdown service"
-extern const struct dcerpc_interface_table dcerpc_table_initshutdown;
+extern const struct ndr_interface_table dcerpc_table_initshutdown;
 NTSTATUS dcerpc_server_initshutdown_init(void);
 #define DCERPC_INITSHUTDOWN_INIT (0x00)
 

diff --git a/source3/librpc/gen_ndr/ndr_lsa.c b/source3/librpc/gen_ndr/ndr_lsa.c
index 49c06fb6a8447355ecbc68f7d0196a88e84dc175..67c85737cebaf095e2b222ff81d83f54b1e422cb 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_lsa.c
+++ b/source3/librpc/gen_ndr/ndr_lsa.c
@@ -11059,7 +11059,7 @@ const struct ndr_interface_string_array lsarpc_authservices = {
 };
 
 
-const struct dcerpc_interface_table dcerpc_table_lsarpc = {
+const struct ndr_interface_table dcerpc_table_lsarpc = {
        .name           = "lsarpc",
        .syntax_id      = {
                {0x12345778,0x1234,0xabcd,{0xef,0x00},{0x01,0x23,0x45,0x67,0x89,0xab}},

diff --git a/source3/librpc/gen_ndr/ndr_lsa.h b/source3/librpc/gen_ndr/ndr_lsa.h
index 13501b139e9046bb803f415cdc6315a862435597..ba951dd2096b4243a174803274e9791729129c62 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_lsa.h
+++ b/source3/librpc/gen_ndr/ndr_lsa.h
@@ -10,7 +10,7 @@
 #define DCERPC_LSARPC_VERSION 0.0
 #define DCERPC_LSARPC_NAME "lsarpc"
 #define DCERPC_LSARPC_HELPSTRING "Local Security Authority"
-extern const struct dcerpc_interface_table dcerpc_table_lsarpc;
+extern const struct ndr_interface_table dcerpc_table_lsarpc;
 NTSTATUS dcerpc_server_lsarpc_init(void);
 #define DCERPC_LSA_CLOSE (0x00)
 

diff --git a/source3/librpc/gen_ndr/ndr_netlogon.c b/source3/librpc/gen_ndr/ndr_netlogon.c
index 87d184aaae94c281eabe891fdb3861566c60d3c6..92fedca1a851ce594b4c810fd0695ee27af55042 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_netlogon.c
+++ b/source3/librpc/gen_ndr/ndr_netlogon.c
@@ -13114,7 +13114,7 @@ const struct ndr_interface_string_array netlogon_authservices = {
 };
 
 
-const struct dcerpc_interface_table dcerpc_table_netlogon = {
+const struct ndr_interface_table dcerpc_table_netlogon = {
        .name           = "netlogon",
        .syntax_id      = {
                {0x12345678,0x1234,0xabcd,{0xef,0x00},{0x01,0x23,0x45,0x67,0xcf,0xfb}},

diff --git a/source3/librpc/gen_ndr/ndr_netlogon.h b/source3/librpc/gen_ndr/ndr_netlogon.h
index f00a3cbdbf0af8096d1249d136d3706bcee59e56..27121adbea34575c4f285502034f2566892a585b 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_netlogon.h
+++ b/source3/librpc/gen_ndr/ndr_netlogon.h
@@ -10,7 +10,7 @@
 #define DCERPC_NETLOGON_VERSION 1.0
 #define DCERPC_NETLOGON_NAME "netlogon"
 #define DCERPC_NETLOGON_HELPSTRING NULL
-extern const struct dcerpc_interface_table dcerpc_table_netlogon;
+extern const struct ndr_interface_table dcerpc_table_netlogon;
 NTSTATUS dcerpc_server_netlogon_init(void);
 #define DCERPC_NETR_LOGONUASLOGON (0x00)
 

diff --git a/source3/librpc/gen_ndr/ndr_srvsvc.c b/source3/librpc/gen_ndr/ndr_srvsvc.c
index 7a67155b976beb8bcc277122adaa53395f9c6164..97a6a6d4d741333486e8ee4329fd3a4d6aa1cdd2 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_srvsvc.c
+++ b/source3/librpc/gen_ndr/ndr_srvsvc.c
@@ -19554,7 +19554,7 @@ const struct ndr_interface_string_array srvsvc_authservices = {
 };
 
 
-const struct dcerpc_interface_table dcerpc_table_srvsvc = {
+const struct ndr_interface_table dcerpc_table_srvsvc = {
        .name           = "srvsvc",
        .syntax_id      = {
                {0x4b324fc8,0x1670,0x01d3,{0x12,0x78},{0x5a,0x47,0xbf,0x6e,0xe1,0x88}},

diff --git a/source3/librpc/gen_ndr/ndr_srvsvc.h b/source3/librpc/gen_ndr/ndr_srvsvc.h
index 090d14beb873cd27b448196ae88a506173654d6a..bcb0ce75ff61715d01ce534daa3f11f671f15c42 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_srvsvc.h
+++ b/source3/librpc/gen_ndr/ndr_srvsvc.h
@@ -10,7 +10,7 @@
 #define DCERPC_SRVSVC_VERSION 3.0
 #define DCERPC_SRVSVC_NAME "srvsvc"
 #define DCERPC_SRVSVC_HELPSTRING "Server Service"
-extern const struct dcerpc_interface_table dcerpc_table_srvsvc;
+extern const struct ndr_interface_table dcerpc_table_srvsvc;
 NTSTATUS dcerpc_server_srvsvc_init(void);
 #define DCERPC_SRVSVC_NETCHARDEVENUM (0x00)
 

diff --git a/source3/librpc/gen_ndr/ndr_svcctl.c b/source3/librpc/gen_ndr/ndr_svcctl.c
index 823676bda959ac1d6895fa9a9b32fba23808aeb7..dc2e542da038efc8302d5d49ec8b5dc94b241081 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_svcctl.c
+++ b/source3/librpc/gen_ndr/ndr_svcctl.c
@@ -5667,7 +5667,7 @@ const struct ndr_interface_string_array svcctl_authservices = {
 };
 
 
-const struct dcerpc_interface_table dcerpc_table_svcctl = {
+const struct ndr_interface_table dcerpc_table_svcctl = {
        .name           = "svcctl",
        .syntax_id      = {
                {0x367abb81,0x9844,0x35f1,{0xad,0x32},{0x98,0xf0,0x38,0x00,0x10,0x03}},

diff --git a/source3/librpc/gen_ndr/ndr_svcctl.h b/source3/librpc/gen_ndr/ndr_svcctl.h
index 83a1c2d58e91600e60bdf74a32611a0a5b8f95d2..6653083a3fcf9ccbab15524553d953e06d04e3f9 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_svcctl.h
+++ b/source3/librpc/gen_ndr/ndr_svcctl.h
@@ -10,7 +10,7 @@
 #define DCERPC_SVCCTL_VERSION 2.0
 #define DCERPC_SVCCTL_NAME "svcctl"
 #define DCERPC_SVCCTL_HELPSTRING "Service Control"
-extern const struct dcerpc_interface_table dcerpc_table_svcctl;
+extern const struct ndr_interface_table dcerpc_table_svcctl;
 NTSTATUS dcerpc_server_svcctl_init(void);
 #define DCERPC_SVCCTL_CLOSESERVICEHANDLE (0x00)
 

diff --git a/source3/librpc/gen_ndr/ndr_unixinfo.c b/source3/librpc/gen_ndr/ndr_unixinfo.c
index a1866ae88c173221200a01788533f3ad65734e72..cdee7e80fd1236bd519e29d3c7f641f29f8509dc 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_unixinfo.c
+++ b/source3/librpc/gen_ndr/ndr_unixinfo.c
@@ -511,7 +511,7 @@ const struct ndr_interface_string_array unixinfo_authservices = {
 };
 
 
-const struct dcerpc_interface_table dcerpc_table_unixinfo = {
+const struct ndr_interface_table dcerpc_table_unixinfo = {
        .name           = "unixinfo",
        .syntax_id      = {
                {0x9c54e310,0xa955,0x4885,{0xbd,0x31},{0x78,0x78,0x71,0x47,0xdf,0xa6}},

diff --git a/source3/librpc/gen_ndr/ndr_unixinfo.h b/source3/librpc/gen_ndr/ndr_unixinfo.h
index 94777e53fec69270710fdf313675caf1745ce0a8..30afb8913caa1c6372282ecc6c7dd78617f3ad87 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_unixinfo.h
+++ b/source3/librpc/gen_ndr/ndr_unixinfo.h
@@ -10,7 +10,7 @@
 #define DCERPC_UNIXINFO_VERSION 0.0
 #define DCERPC_UNIXINFO_NAME "unixinfo"
 #define DCERPC_UNIXINFO_HELPSTRING "Unixinfo specific stuff"
-extern const struct dcerpc_interface_table dcerpc_table_unixinfo;
+extern const struct ndr_interface_table dcerpc_table_unixinfo;
 NTSTATUS dcerpc_server_unixinfo_init(void);
 #define DCERPC_UNIXINFO_SIDTOUID (0x00)
 

diff --git a/source3/librpc/gen_ndr/ndr_winreg.c b/source3/librpc/gen_ndr/ndr_winreg.c
index 82381e15558785af8f0c0e5a63e6ce79fbadcd33..94c87180dc17e1eaa8c58f5ce1d7e0257a5ae995 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_winreg.c
+++ b/source3/librpc/gen_ndr/ndr_winreg.c
@@ -4404,7 +4404,7 @@ const struct ndr_interface_string_array winreg_authservices = {
 };
 
 
-const struct dcerpc_interface_table dcerpc_table_winreg = {
+const struct ndr_interface_table dcerpc_table_winreg = {
        .name           = "winreg",
        .syntax_id      = {
                {0x338cd001,0x2244,0x31f1,{0xaa,0xaa},{0x90,0x00,0x38,0x00,0x10,0x03}},

diff --git a/source3/librpc/gen_ndr/ndr_winreg.h b/source3/librpc/gen_ndr/ndr_winreg.h
index a224db006c09b6538ff8c1f3b23c4c33d6092849..0679444a02d84479354036ca832885486d6d254c 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_winreg.h
+++ b/source3/librpc/gen_ndr/ndr_winreg.h
@@ -10,7 +10,7 @@
 #define DCERPC_WINREG_VERSION 1.0
 #define DCERPC_WINREG_NAME "winreg"
 #define DCERPC_WINREG_HELPSTRING "Remote Registry Service"
-extern const struct dcerpc_interface_table dcerpc_table_winreg;
+extern const struct ndr_interface_table dcerpc_table_winreg;
 NTSTATUS dcerpc_server_winreg_init(void);
 #define DCERPC_WINREG_OPENHKCR (0x00)
 

diff --git a/source3/librpc/gen_ndr/ndr_wkssvc.c b/source3/librpc/gen_ndr/ndr_wkssvc.c
index cb610767217d5e7192c6fcd43de687a2589169fd..c13213e5c20ec24f2c6687e69ff56d93f6e8ccbb 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_wkssvc.c
+++ b/source3/librpc/gen_ndr/ndr_wkssvc.c
@@ -4772,7 +4772,7 @@ const struct ndr_interface_string_array wkssvc_authservices = {
 };
 
 
-const struct dcerpc_interface_table dcerpc_table_wkssvc = {
+const struct ndr_interface_table dcerpc_table_wkssvc = {
        .name           = "wkssvc",
        .syntax_id      = {
                {0x6bffd098,0xa112,0x3610,{0x98,0x33},{0x46,0xc3,0xf8,0x7e,0x34,0x5a}},

diff --git a/source3/librpc/gen_ndr/ndr_wkssvc.h b/source3/librpc/gen_ndr/ndr_wkssvc.h
index 69ed5c86fd6c2f28517b27ac3d562fcebc1bc8b5..db54a017caffd04ebe89a7b4cfb9f80e4aacb8ac 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_wkssvc.h
+++ b/source3/librpc/gen_ndr/ndr_wkssvc.h
@@ -10,7 +10,7 @@
 #define DCERPC_WKSSVC_VERSION 1.0
 #define DCERPC_WKSSVC_NAME "wkssvc"
 #define DCERPC_WKSSVC_HELPSTRING "Workstation Service"
-extern const struct dcerpc_interface_table dcerpc_table_wkssvc;
+extern const struct ndr_interface_table dcerpc_table_wkssvc;
 NTSTATUS dcerpc_server_wkssvc_init(void);
 #define DCERPC_WKSSVC_NETWKSTAGETINFO (0x00)
 

diff --git a/source3/librpc/ndr/libndr.h b/source3/librpc/ndr/libndr.h
index 5902bbd2bc0e7d5dded094aa27142d8bfb1df162..adf2c94e4aaa1814ad71241dc8b1f09b9b2cbdd7 100644 (file)
--- a/source3/librpc/ndr/libndr.h
+++ b/source3/librpc/ndr/libndr.h
@@ -301,6 +301,19 @@ struct ndr_interface_string_array {
        const char * const *names;
 };
 
-#include "dcerpc.h"
+struct ndr_interface_table {
+       const char *name;
+       struct ndr_syntax_id syntax_id;
+       const char *helpstring;
+       uint32_t num_calls;
+       const struct ndr_interface_call *calls;
+       const struct ndr_interface_string_array *endpoints;
+       const struct ndr_interface_string_array *authservices;
+};
+
+struct ndr_interface_list {
+       struct ndr_interface_list *prev, *next;
+       const struct ndr_interface_table *table;
+};
 
 #endif /* __LIBNDR_H__ */

diff --git a/source3/librpc/tables.pl b/source3/librpc/tables.pl
index 9ad0675cb23a8c77428a7d39176980698474417b..946159c6f0f23b377bd9c5f31001dd69a6eb4ce0 100755 (executable)
--- a/source3/librpc/tables.pl
+++ b/source3/librpc/tables.pl
@@ -51,7 +51,7 @@ sub process_file($)
        my $found = 0;
 
        while (my $line = <FILE>) {
-               if ($line =~ /extern const struct dcerpc_interface_table (\w+);/) {
+               if ($line =~ /extern const struct ndr_interface_table (\w+);/) {
                        $found = 1;
                        $init_fns.="\tstatus = librpc_register_interface(&$1);\n";
                        $init_fns.="\tif (NT_STATUS_IS_ERR(status)) return status;\n\n";

diff --git a/source3/librpc/tools/ndrdump.c b/source3/librpc/tools/ndrdump.c
index cbc97cab9835e067e5e87261a37dd33812f49c09..d120e33c07c9f4ee0efe2a0448dd093123aac22d 100644 (file)
--- a/source3/librpc/tools/ndrdump.c
+++ b/source3/librpc/tools/ndrdump.c
@@ -28,7 +28,7 @@
 #endif
 
 static const struct ndr_interface_call *find_function(
-       const struct dcerpc_interface_table *p,
+       const struct ndr_interface_table *p,
        const char *function)
 {
        int i;
@@ -52,7 +52,7 @@ static const struct ndr_interface_call *find_function(
 
 static void show_pipes(void)
 {
-       const struct dcerpc_interface_list *l;
+       const struct ndr_interface_list *l;
        printf("\nYou must specify a pipe\n");
        printf("known pipes are:\n");
        for (l=librpc_dcerpc_pipes();l;l=l->next) {
@@ -67,7 +67,7 @@ static void show_pipes(void)
 
 #endif
 
-static void show_functions(const struct dcerpc_interface_table *p)
+static void show_functions(const struct ndr_interface_table *p)
 {
        int i;
        printf("\nYou must specify a function\n");
@@ -104,9 +104,9 @@ static char *stdin_load(TALLOC_CTX *mem_ctx, size_t *size)
        return result;
 }
 
-static const struct dcerpc_interface_table *load_iface_from_plugin(const char *plugin, const char *pipe_name)
+static const struct ndr_interface_table *load_iface_from_plugin(const char *plugin, const char *pipe_name)
 {
-       const struct dcerpc_interface_table *p;
+       const struct ndr_interface_table *p;
        void *handle;
        char *symbol;
 
@@ -117,7 +117,7 @@ static const struct dcerpc_interface_table *load_iface_from_plugin(const char *p
        }
 
        symbol = talloc_asprintf(NULL, "dcerpc_table_%s", pipe_name);
-       p = (const struct dcerpc_interface_table *)dlsym(handle, symbol);
+       p = (const struct ndr_interface_table *)dlsym(handle, symbol);
 
        if (!p) {
                printf("%s: Unable to find DCE/RPC interface table for '%s': %s\n", plugin, pipe_name, dlerror());
@@ -132,7 +132,7 @@ static const struct dcerpc_interface_table *load_iface_from_plugin(const char *p
 
  int main(int argc, const char *argv[])
 {
-       const struct dcerpc_interface_table *p = NULL;
+       const struct ndr_interface_table *p = NULL;
        const struct ndr_interface_call *f;
        const char *pipe_name, *function, *inout, *filename;
        uint8_t *data;