r24558: merge from SAMBA_4_0:

rename 'dcerpc_table_' -> 'ndr_table_'

metze
(This used to be commit 4e5908cd596f97d3bb73bd9c0bf3d360944f7810)

26 files changed, 38 insertions, 38 deletions

diff --git a/source3/librpc/gen_ndr/ndr_dfs.c b/source3/librpc/gen_ndr/ndr_dfs.c
index b841fb875e..98489b3310 100644
--- 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 ndr_interface_table dcerpc_table_netdfs = {
+const struct ndr_interface_table ndr_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 7ae59f901b..c55b88033c 100644
--- 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 ndr_interface_table dcerpc_table_netdfs;
+extern const struct ndr_interface_table ndr_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 53a98139dd..9039b6fd7d 100644
--- 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 ndr_interface_table dcerpc_table_rpcecho = {
+const struct ndr_interface_table ndr_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 8b6820cb2a..c05845fda4 100644
--- 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 ndr_interface_table dcerpc_table_rpcecho;
+extern const struct ndr_interface_table ndr_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 21e0901908..be8b75955f 100644
--- 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 ndr_interface_table dcerpc_table_epmapper = {
+const struct ndr_interface_table ndr_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 a19fd8b47b..3c85e0f993 100644
--- 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 ndr_interface_table dcerpc_table_epmapper;
+extern const struct ndr_interface_table ndr_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 ad6aa1f0a8..0f46e936c1 100644
--- 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 ndr_interface_table dcerpc_table_eventlog = {
+const struct ndr_interface_table ndr_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 5ccc5b53ee..cdebc98ff8 100644
--- 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 ndr_interface_table dcerpc_table_eventlog;
+extern const struct ndr_interface_table ndr_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 f834a66332..8c9f137497 100644
--- 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 ndr_interface_table dcerpc_table_initshutdown = {
+const struct ndr_interface_table ndr_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 c3851a910a..93800bf9f0 100644
--- 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 ndr_interface_table dcerpc_table_initshutdown;
+extern const struct ndr_interface_table ndr_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 67c85737ce..bfa125cc1e 100644
--- 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 ndr_interface_table dcerpc_table_lsarpc = {
+const struct ndr_interface_table ndr_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 ba951dd209..2a4d546c2f 100644
--- 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 ndr_interface_table dcerpc_table_lsarpc;
+extern const struct ndr_interface_table ndr_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 92fedca1a8..430ed3820b 100644
--- 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 ndr_interface_table dcerpc_table_netlogon = {
+const struct ndr_interface_table ndr_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 27121adbea..f3c9d16d95 100644
--- 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 ndr_interface_table dcerpc_table_netlogon;
+extern const struct ndr_interface_table ndr_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 97a6a6d4d7..d362f864a0 100644
--- 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 ndr_interface_table dcerpc_table_srvsvc = {
+const struct ndr_interface_table ndr_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 bcb0ce75ff..bf5c28fe92 100644
--- 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 ndr_interface_table dcerpc_table_srvsvc;
+extern const struct ndr_interface_table ndr_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 dc2e542da0..e142498048 100644
--- 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 ndr_interface_table dcerpc_table_svcctl = {
+const struct ndr_interface_table ndr_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 6653083a3f..fd1b3c5cee 100644
--- 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 ndr_interface_table dcerpc_table_svcctl;
+extern const struct ndr_interface_table ndr_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 cdee7e80fd..b0ee0c5cb8 100644
--- 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 ndr_interface_table dcerpc_table_unixinfo = {
+const struct ndr_interface_table ndr_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 30afb8913c..fa5cad86d9 100644
--- 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 ndr_interface_table dcerpc_table_unixinfo;
+extern const struct ndr_interface_table ndr_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 94c87180dc..d8e2d24398 100644
--- 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 ndr_interface_table dcerpc_table_winreg = {
+const struct ndr_interface_table ndr_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 0679444a02..79f29956a2 100644
--- 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 ndr_interface_table dcerpc_table_winreg;
+extern const struct ndr_interface_table ndr_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 c13213e5c2..8f2f25f247 100644
--- 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 ndr_interface_table dcerpc_table_wkssvc = {
+const struct ndr_interface_table ndr_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 db54a017ca..75ba45ba79 100644
--- 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 ndr_interface_table dcerpc_table_wkssvc;
+extern const struct ndr_interface_table ndr_table_wkssvc;
 NTSTATUS dcerpc_server_wkssvc_init(void);
 #define DCERPC_WKSSVC_NETWKSTAGETINFO (0x00)
 
diff --git a/source3/librpc/gen_ndr/tables.c b/source3/librpc/gen_ndr/tables.c
index 9a1c5a06d5..1a24afe0d0 100644
--- a/source3/librpc/gen_ndr/tables.c
+++ b/source3/librpc/gen_ndr/tables.c
@@ -21,40 +21,40 @@ NTSTATUS dcerpc_register_builtin_interfaces(void)
 {
 	NTSTATUS status;
 
-	status = librpc_register_interface(&dcerpc_table_netdfs);
+	status = librpc_register_interface(&ndr_table_netdfs);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
-	status = librpc_register_interface(&dcerpc_table_rpcecho);
+	status = librpc_register_interface(&ndr_table_rpcecho);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
-	status = librpc_register_interface(&dcerpc_table_epmapper);
+	status = librpc_register_interface(&ndr_table_epmapper);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
-	status = librpc_register_interface(&dcerpc_table_eventlog);
+	status = librpc_register_interface(&ndr_table_eventlog);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
-	status = librpc_register_interface(&dcerpc_table_initshutdown);
+	status = librpc_register_interface(&ndr_table_initshutdown);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
-	status = librpc_register_interface(&dcerpc_table_lsarpc);
+	status = librpc_register_interface(&ndr_table_lsarpc);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
-	status = librpc_register_interface(&dcerpc_table_netlogon);
+	status = librpc_register_interface(&ndr_table_netlogon);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
-	status = librpc_register_interface(&dcerpc_table_srvsvc);
+	status = librpc_register_interface(&ndr_table_srvsvc);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
-	status = librpc_register_interface(&dcerpc_table_svcctl);
+	status = librpc_register_interface(&ndr_table_svcctl);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
-	status = librpc_register_interface(&dcerpc_table_unixinfo);
+	status = librpc_register_interface(&ndr_table_unixinfo);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
-	status = librpc_register_interface(&dcerpc_table_winreg);
+	status = librpc_register_interface(&ndr_table_winreg);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
-	status = librpc_register_interface(&dcerpc_table_wkssvc);
+	status = librpc_register_interface(&ndr_table_wkssvc);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
 
diff --git a/source3/librpc/tools/ndrdump.c b/source3/librpc/tools/ndrdump.c
index d120e33c07..01ae2253ff 100644
--- a/source3/librpc/tools/ndrdump.c
+++ b/source3/librpc/tools/ndrdump.c
@@ -116,7 +116,7 @@ static const struct ndr_interface_table *load_iface_from_plugin(const char *plug
 		return NULL;
 	}
 
-	symbol = talloc_asprintf(NULL, "dcerpc_table_%s", pipe_name);
+	symbol = talloc_asprintf(NULL, "ndr_table_%s", pipe_name);
 	p = (const struct ndr_interface_table *)dlsym(handle, symbol);
 
 	if (!p) {
@@ -164,7 +164,7 @@ static const struct ndr_interface_table *load_iface_from_plugin(const char *plug
 	};
 
 #if (_SAMBA_BUILD_ >= 4)
-	dcerpc_table_init();
+	ndr_table_init();
 #else
 	/* Initialise samba stuff */
 	load_case_tables();