svn commit: samba r24552 - in branches/SAMBA_3_2/source: include
librpc librpc/gen_ndr librpc/ndr librpc/tools
metze at samba.org
metze at samba.org
Sun Aug 19 20:47:33 GMT 2007
Author: metze
Date: 2007-08-19 20:47:31 +0000 (Sun, 19 Aug 2007)
New Revision: 24552
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24552
Log:
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
Removed:
branches/SAMBA_3_2/source/include/dcerpc.h
Modified:
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_dfs.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_dfs.h
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_echo.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_echo.h
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_epmapper.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_epmapper.h
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_eventlog.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_eventlog.h
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_initshutdown.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_initshutdown.h
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_lsa.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_lsa.h
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_netlogon.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_netlogon.h
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_srvsvc.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_srvsvc.h
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.h
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_unixinfo.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_unixinfo.h
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_winreg.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_winreg.h
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_wkssvc.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_wkssvc.h
branches/SAMBA_3_2/source/librpc/ndr/libndr.h
branches/SAMBA_3_2/source/librpc/tables.pl
branches/SAMBA_3_2/source/librpc/tools/ndrdump.c
Changeset:
Deleted: branches/SAMBA_3_2/source/include/dcerpc.h
===================================================================
--- branches/SAMBA_3_2/source/include/dcerpc.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/include/dcerpc.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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;
-};
-
-
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_dfs.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_dfs.c 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_dfs.c 2007-08-19 20:47:31 UTC (rev 24552)
@@ -5328,7 +5328,7 @@
};
-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}},
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_dfs.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_dfs.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_dfs.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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)
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_echo.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_echo.c 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_echo.c 2007-08-19 20:47:31 UTC (rev 24552)
@@ -1445,7 +1445,7 @@
};
-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}},
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_echo.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_echo.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_echo.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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)
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_epmapper.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_epmapper.c 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_epmapper.c 2007-08-19 20:47:31 UTC (rev 24552)
@@ -2671,7 +2671,7 @@
};
-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}},
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_epmapper.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_epmapper.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_epmapper.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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)
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_eventlog.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_eventlog.c 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_eventlog.c 2007-08-19 20:47:31 UTC (rev 24552)
@@ -1629,7 +1629,7 @@
};
-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}},
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_eventlog.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_eventlog.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_eventlog.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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)
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_initshutdown.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_initshutdown.c 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_initshutdown.c 2007-08-19 20:47:31 UTC (rev 24552)
@@ -414,7 +414,7 @@
};
-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}},
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_initshutdown.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_initshutdown.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_initshutdown.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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)
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_lsa.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_lsa.c 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_lsa.c 2007-08-19 20:47:31 UTC (rev 24552)
@@ -11059,7 +11059,7 @@
};
-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}},
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_lsa.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_lsa.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_lsa.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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)
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_netlogon.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_netlogon.c 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_netlogon.c 2007-08-19 20:47:31 UTC (rev 24552)
@@ -13114,7 +13114,7 @@
};
-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}},
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_netlogon.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_netlogon.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_netlogon.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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)
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_srvsvc.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_srvsvc.c 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_srvsvc.c 2007-08-19 20:47:31 UTC (rev 24552)
@@ -19554,7 +19554,7 @@
};
-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}},
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_srvsvc.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_srvsvc.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_srvsvc.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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)
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.c 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.c 2007-08-19 20:47:31 UTC (rev 24552)
@@ -5667,7 +5667,7 @@
};
-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}},
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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)
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_unixinfo.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_unixinfo.c 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_unixinfo.c 2007-08-19 20:47:31 UTC (rev 24552)
@@ -511,7 +511,7 @@
};
-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}},
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_unixinfo.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_unixinfo.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_unixinfo.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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)
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_winreg.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_winreg.c 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_winreg.c 2007-08-19 20:47:31 UTC (rev 24552)
@@ -4404,7 +4404,7 @@
};
-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}},
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_winreg.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_winreg.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_winreg.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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)
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_wkssvc.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_wkssvc.c 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_wkssvc.c 2007-08-19 20:47:31 UTC (rev 24552)
@@ -4772,7 +4772,7 @@
};
-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}},
Modified: branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_wkssvc.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_wkssvc.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_wkssvc.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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)
Modified: branches/SAMBA_3_2/source/librpc/ndr/libndr.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/ndr/libndr.h 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/ndr/libndr.h 2007-08-19 20:47:31 UTC (rev 24552)
@@ -301,6 +301,19 @@
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__ */
Modified: branches/SAMBA_3_2/source/librpc/tables.pl
===================================================================
--- branches/SAMBA_3_2/source/librpc/tables.pl 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/tables.pl 2007-08-19 20:47:31 UTC (rev 24552)
@@ -51,7 +51,7 @@
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";
Modified: branches/SAMBA_3_2/source/librpc/tools/ndrdump.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/tools/ndrdump.c 2007-08-19 20:46:45 UTC (rev 24551)
+++ branches/SAMBA_3_2/source/librpc/tools/ndrdump.c 2007-08-19 20:47:31 UTC (rev 24552)
@@ -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 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 @@
#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 @@
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 @@
}
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 @@
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;
More information about the samba-cvs
mailing list