svn commit: samba r24539 - in branches/SAMBA_3_2_0/source: include
librpc/gen_ndr librpc/ndr librpc/tools
metze at samba.org
metze at samba.org
Sat Aug 18 10:34:04 GMT 2007
Author: metze
Date: 2007-08-18 10:34:01 +0000 (Sat, 18 Aug 2007)
New Revision: 24539
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24539
Log:
merge from SAMBA_4_0:
rename struct dcerpc_interface_call -> struct ndr_interface_call
and move it to librpc/ndr/libndr.h
metze
Modified:
branches/SAMBA_3_2_0/source/include/dcerpc.h
branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_dfs.c
branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_echo.c
branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_epmapper.c
branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_eventlog.c
branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_initshutdown.c
branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_lsa.c
branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_netlogon.c
branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_srvsvc.c
branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_svcctl.c
branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_unixinfo.c
branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_winreg.c
branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_wkssvc.c
branches/SAMBA_3_2_0/source/librpc/ndr/libndr.h
branches/SAMBA_3_2_0/source/librpc/tools/ndrdump.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/include/dcerpc.h
===================================================================
--- branches/SAMBA_3_2_0/source/include/dcerpc.h 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/include/dcerpc.h 2007-08-18 10:34:01 UTC (rev 24539)
@@ -1,17 +1,5 @@
/* unused. Stub to make the pidl generated NDR parsers compile */
-/*
- this is used to find pointers to calls
-*/
-struct dcerpc_interface_call {
- const char *name;
- size_t struct_size;
- ndr_push_flags_fn_t ndr_push;
- ndr_pull_flags_fn_t ndr_pull;
- ndr_print_function_t ndr_print;
- BOOL async;
-};
-
struct dcerpc_endpoint_list {
uint32_t count;
const char * const *names;
@@ -27,7 +15,7 @@
struct ndr_syntax_id syntax_id;
const char *helpstring;
uint32_t num_calls;
- const struct dcerpc_interface_call *calls;
+ const struct ndr_interface_call *calls;
const struct dcerpc_endpoint_list *endpoints;
const struct dcerpc_authservice_list *authservices;
};
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_dfs.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_dfs.c 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_dfs.c 2007-08-18 10:34:01 UTC (rev 24539)
@@ -5121,7 +5121,7 @@
ndr->depth--;
}
-const struct dcerpc_interface_call netdfs_calls[] = {
+const struct ndr_interface_call netdfs_calls[] = {
{
"dfs_GetManagerVersion",
sizeof(struct dfs_GetManagerVersion),
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_echo.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_echo.c 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_echo.c 2007-08-18 10:34:01 UTC (rev 24539)
@@ -1340,7 +1340,7 @@
ndr->depth--;
}
-const struct dcerpc_interface_call rpcecho_calls[] = {
+const struct ndr_interface_call rpcecho_calls[] = {
{
"echo_AddOne",
sizeof(struct echo_AddOne),
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_epmapper.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_epmapper.c 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_epmapper.c 2007-08-18 10:34:01 UTC (rev 24539)
@@ -2582,7 +2582,7 @@
ndr->depth--;
}
-const struct dcerpc_interface_call epmapper_calls[] = {
+const struct ndr_interface_call epmapper_calls[] = {
{
"epm_Insert",
sizeof(struct epm_Insert),
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_eventlog.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_eventlog.c 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_eventlog.c 2007-08-18 10:34:01 UTC (rev 24539)
@@ -1414,7 +1414,7 @@
ndr->depth--;
}
-const struct dcerpc_interface_call eventlog_calls[] = {
+const struct ndr_interface_call eventlog_calls[] = {
{
"eventlog_ClearEventLogW",
sizeof(struct eventlog_ClearEventLogW),
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_initshutdown.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_initshutdown.c 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_initshutdown.c 2007-08-18 10:34:01 UTC (rev 24539)
@@ -367,7 +367,7 @@
ndr->depth--;
}
-const struct dcerpc_interface_call initshutdown_calls[] = {
+const struct ndr_interface_call initshutdown_calls[] = {
{
"initshutdown_Init",
sizeof(struct initshutdown_Init),
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_lsa.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_lsa.c 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_lsa.c 2007-08-18 10:34:01 UTC (rev 24539)
@@ -10376,7 +10376,7 @@
ndr->depth--;
}
-const struct dcerpc_interface_call lsarpc_calls[] = {
+const struct ndr_interface_call lsarpc_calls[] = {
{
"lsa_Close",
sizeof(struct lsa_Close),
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_netlogon.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_netlogon.c 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_netlogon.c 2007-08-18 10:34:01 UTC (rev 24539)
@@ -12713,7 +12713,7 @@
ndr->depth--;
}
-const struct dcerpc_interface_call netlogon_calls[] = {
+const struct ndr_interface_call netlogon_calls[] = {
{
"netr_LogonUasLogon",
sizeof(struct netr_LogonUasLogon),
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_srvsvc.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_srvsvc.c 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_srvsvc.c 2007-08-18 10:34:01 UTC (rev 24539)
@@ -19097,7 +19097,7 @@
ndr->depth--;
}
-const struct dcerpc_interface_call srvsvc_calls[] = {
+const struct ndr_interface_call srvsvc_calls[] = {
{
"srvsvc_NetCharDevEnum",
sizeof(struct srvsvc_NetCharDevEnum),
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_svcctl.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_svcctl.c 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_svcctl.c 2007-08-18 10:34:01 UTC (rev 24539)
@@ -5291,7 +5291,7 @@
ndr->depth--;
}
-const struct dcerpc_interface_call svcctl_calls[] = {
+const struct ndr_interface_call svcctl_calls[] = {
{
"svcctl_CloseServiceHandle",
sizeof(struct svcctl_CloseServiceHandle),
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_unixinfo.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_unixinfo.c 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_unixinfo.c 2007-08-18 10:34:01 UTC (rev 24539)
@@ -446,7 +446,7 @@
ndr->depth--;
}
-const struct dcerpc_interface_call unixinfo_calls[] = {
+const struct ndr_interface_call unixinfo_calls[] = {
{
"unixinfo_SidToUid",
sizeof(struct unixinfo_SidToUid),
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_winreg.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_winreg.c 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_winreg.c 2007-08-18 10:34:01 UTC (rev 24539)
@@ -4099,7 +4099,7 @@
ndr->depth--;
}
-const struct dcerpc_interface_call winreg_calls[] = {
+const struct ndr_interface_call winreg_calls[] = {
{
"winreg_OpenHKCR",
sizeof(struct winreg_OpenHKCR),
Modified: branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_wkssvc.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_wkssvc.c 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/gen_ndr/ndr_wkssvc.c 2007-08-18 10:34:01 UTC (rev 24539)
@@ -4501,7 +4501,7 @@
ndr->depth--;
}
-const struct dcerpc_interface_call wkssvc_calls[] = {
+const struct ndr_interface_call wkssvc_calls[] = {
{
"wkssvc_NetWkstaGetInfo",
sizeof(struct wkssvc_NetWkstaGetInfo),
Modified: branches/SAMBA_3_2_0/source/librpc/ndr/libndr.h
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/ndr/libndr.h 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/ndr/libndr.h 2007-08-18 10:34:01 UTC (rev 24539)
@@ -287,6 +287,15 @@
extern const struct ndr_syntax_id ndr_transfer_syntax;
extern const struct ndr_syntax_id ndr64_transfer_syntax;
+struct ndr_interface_call {
+ const char *name;
+ size_t struct_size;
+ ndr_push_flags_fn_t ndr_push;
+ ndr_pull_flags_fn_t ndr_pull;
+ ndr_print_function_t ndr_print;
+ BOOL async;
+};
+
#include "dcerpc.h"
#endif /* __LIBNDR_H__ */
Modified: branches/SAMBA_3_2_0/source/librpc/tools/ndrdump.c
===================================================================
--- branches/SAMBA_3_2_0/source/librpc/tools/ndrdump.c 2007-08-18 10:33:44 UTC (rev 24538)
+++ branches/SAMBA_3_2_0/source/librpc/tools/ndrdump.c 2007-08-18 10:34:01 UTC (rev 24539)
@@ -27,7 +27,7 @@
#include "librpc/rpc/dcerpc_table.h"
#endif
-static const struct dcerpc_interface_call *find_function(
+static const struct ndr_interface_call *find_function(
const struct dcerpc_interface_table *p,
const char *function)
{
@@ -133,7 +133,7 @@
int main(int argc, const char *argv[])
{
const struct dcerpc_interface_table *p = NULL;
- const struct dcerpc_interface_call *f;
+ const struct ndr_interface_call *f;
const char *pipe_name, *function, *inout, *filename;
uint8_t *data;
size_t size;
More information about the samba-cvs
mailing list