summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-08-18 10:33:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:29:55 -0500
commit68821746d8f79e7480b936d215875eb17af7eccf (patch)
treef0ddf8dffc2d83d4ab9db8bfb48ee4cbd0ca5e55 /source3
parentb018c9b9a22fa44b924a64f7a3ee8c0e38f614e2 (diff)
downloadsamba-68821746d8f79e7480b936d215875eb17af7eccf.tar.gz
samba-68821746d8f79e7480b936d215875eb17af7eccf.tar.bz2
samba-68821746d8f79e7480b936d215875eb17af7eccf.zip
r24538: merge from SAMBA_4_0:
rename struct dcerpc_interface_call -> struct ndr_interface_call and move it to librpc/ndr/libndr.h metze (This used to be commit 24e096b3659c3070a1ce029174fba51ae59e89ad)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/dcerpc.h14
-rw-r--r--source3/librpc/gen_ndr/ndr_dfs.c2
-rw-r--r--source3/librpc/gen_ndr/ndr_echo.c2
-rw-r--r--source3/librpc/gen_ndr/ndr_epmapper.c2
-rw-r--r--source3/librpc/gen_ndr/ndr_eventlog.c2
-rw-r--r--source3/librpc/gen_ndr/ndr_initshutdown.c2
-rw-r--r--source3/librpc/gen_ndr/ndr_lsa.c2
-rw-r--r--source3/librpc/gen_ndr/ndr_netlogon.c2
-rw-r--r--source3/librpc/gen_ndr/ndr_srvsvc.c2
-rw-r--r--source3/librpc/gen_ndr/ndr_svcctl.c2
-rw-r--r--source3/librpc/gen_ndr/ndr_unixinfo.c2
-rw-r--r--source3/librpc/gen_ndr/ndr_winreg.c2
-rw-r--r--source3/librpc/gen_ndr/ndr_wkssvc.c2
-rw-r--r--source3/librpc/ndr/libndr.h9
-rw-r--r--source3/librpc/tools/ndrdump.c4
15 files changed, 24 insertions, 27 deletions
diff --git a/source3/include/dcerpc.h b/source3/include/dcerpc.h
index a98971ddd4..a050dd8020 100644
--- a/source3/include/dcerpc.h
+++ b/source3/include/dcerpc.h
@@ -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 dcerpc_interface_table {
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;
};
diff --git a/source3/librpc/gen_ndr/ndr_dfs.c b/source3/librpc/gen_ndr/ndr_dfs.c
index 137c189c46..1ec20d562c 100644
--- a/source3/librpc/gen_ndr/ndr_dfs.c
+++ b/source3/librpc/gen_ndr/ndr_dfs.c
@@ -5121,7 +5121,7 @@ _PUBLIC_ void ndr_print_dfs_SetInfo2(struct ndr_print *ndr, const char *name, in
ndr->depth--;
}
-const struct dcerpc_interface_call netdfs_calls[] = {
+const struct ndr_interface_call netdfs_calls[] = {
{
"dfs_GetManagerVersion",
sizeof(struct dfs_GetManagerVersion),
diff --git a/source3/librpc/gen_ndr/ndr_echo.c b/source3/librpc/gen_ndr/ndr_echo.c
index 8c2695ab20..a3a4e0818a 100644
--- a/source3/librpc/gen_ndr/ndr_echo.c
+++ b/source3/librpc/gen_ndr/ndr_echo.c
@@ -1340,7 +1340,7 @@ _PUBLIC_ void ndr_print_echo_TestDoublePointer(struct ndr_print *ndr, const char
ndr->depth--;
}
-const struct dcerpc_interface_call rpcecho_calls[] = {
+const struct ndr_interface_call rpcecho_calls[] = {
{
"echo_AddOne",
sizeof(struct echo_AddOne),
diff --git a/source3/librpc/gen_ndr/ndr_epmapper.c b/source3/librpc/gen_ndr/ndr_epmapper.c
index 1ef21a414c..6e26533b55 100644
--- a/source3/librpc/gen_ndr/ndr_epmapper.c
+++ b/source3/librpc/gen_ndr/ndr_epmapper.c
@@ -2582,7 +2582,7 @@ _PUBLIC_ void ndr_print_epm_MapAuth(struct ndr_print *ndr, const char *name, int
ndr->depth--;
}
-const struct dcerpc_interface_call epmapper_calls[] = {
+const struct ndr_interface_call epmapper_calls[] = {
{
"epm_Insert",
sizeof(struct epm_Insert),
diff --git a/source3/librpc/gen_ndr/ndr_eventlog.c b/source3/librpc/gen_ndr/ndr_eventlog.c
index dc29a2ae65..9f7294819c 100644
--- a/source3/librpc/gen_ndr/ndr_eventlog.c
+++ b/source3/librpc/gen_ndr/ndr_eventlog.c
@@ -1414,7 +1414,7 @@ _PUBLIC_ void ndr_print_eventlog_FlushEventLog(struct ndr_print *ndr, const char
ndr->depth--;
}
-const struct dcerpc_interface_call eventlog_calls[] = {
+const struct ndr_interface_call eventlog_calls[] = {
{
"eventlog_ClearEventLogW",
sizeof(struct eventlog_ClearEventLogW),
diff --git a/source3/librpc/gen_ndr/ndr_initshutdown.c b/source3/librpc/gen_ndr/ndr_initshutdown.c
index aa35a8dd05..76e7878ae4 100644
--- a/source3/librpc/gen_ndr/ndr_initshutdown.c
+++ b/source3/librpc/gen_ndr/ndr_initshutdown.c
@@ -367,7 +367,7 @@ _PUBLIC_ void ndr_print_initshutdown_InitEx(struct ndr_print *ndr, const char *n
ndr->depth--;
}
-const struct dcerpc_interface_call initshutdown_calls[] = {
+const struct ndr_interface_call initshutdown_calls[] = {
{
"initshutdown_Init",
sizeof(struct initshutdown_Init),
diff --git a/source3/librpc/gen_ndr/ndr_lsa.c b/source3/librpc/gen_ndr/ndr_lsa.c
index 205d374549..d6863c3fb9 100644
--- a/source3/librpc/gen_ndr/ndr_lsa.c
+++ b/source3/librpc/gen_ndr/ndr_lsa.c
@@ -10376,7 +10376,7 @@ _PUBLIC_ void ndr_print_lsa_LSARADTREPORTSECURITYEVENT(struct ndr_print *ndr, co
ndr->depth--;
}
-const struct dcerpc_interface_call lsarpc_calls[] = {
+const struct ndr_interface_call lsarpc_calls[] = {
{
"lsa_Close",
sizeof(struct lsa_Close),
diff --git a/source3/librpc/gen_ndr/ndr_netlogon.c b/source3/librpc/gen_ndr/ndr_netlogon.c
index 0e0fa196e8..0566df8946 100644
--- a/source3/librpc/gen_ndr/ndr_netlogon.c
+++ b/source3/librpc/gen_ndr/ndr_netlogon.c
@@ -12713,7 +12713,7 @@ _PUBLIC_ void ndr_print_netr_NETRSERVERGETTRUSTINFO(struct ndr_print *ndr, const
ndr->depth--;
}
-const struct dcerpc_interface_call netlogon_calls[] = {
+const struct ndr_interface_call netlogon_calls[] = {
{
"netr_LogonUasLogon",
sizeof(struct netr_LogonUasLogon),
diff --git a/source3/librpc/gen_ndr/ndr_srvsvc.c b/source3/librpc/gen_ndr/ndr_srvsvc.c
index 4377b7acfb..76c542c675 100644
--- a/source3/librpc/gen_ndr/ndr_srvsvc.c
+++ b/source3/librpc/gen_ndr/ndr_srvsvc.c
@@ -19097,7 +19097,7 @@ _PUBLIC_ void ndr_print_srvsvc_NETRSERVERTRANSPORTDELEX(struct ndr_print *ndr, c
ndr->depth--;
}
-const struct dcerpc_interface_call srvsvc_calls[] = {
+const struct ndr_interface_call srvsvc_calls[] = {
{
"srvsvc_NetCharDevEnum",
sizeof(struct srvsvc_NetCharDevEnum),
diff --git a/source3/librpc/gen_ndr/ndr_svcctl.c b/source3/librpc/gen_ndr/ndr_svcctl.c
index 789503346e..ed3b96ae27 100644
--- a/source3/librpc/gen_ndr/ndr_svcctl.c
+++ b/source3/librpc/gen_ndr/ndr_svcctl.c
@@ -5291,7 +5291,7 @@ _PUBLIC_ void ndr_print_svcctl_SCSendTSMessage(struct ndr_print *ndr, const char
ndr->depth--;
}
-const struct dcerpc_interface_call svcctl_calls[] = {
+const struct ndr_interface_call svcctl_calls[] = {
{
"svcctl_CloseServiceHandle",
sizeof(struct svcctl_CloseServiceHandle),
diff --git a/source3/librpc/gen_ndr/ndr_unixinfo.c b/source3/librpc/gen_ndr/ndr_unixinfo.c
index b85cc0319a..cec9c18945 100644
--- a/source3/librpc/gen_ndr/ndr_unixinfo.c
+++ b/source3/librpc/gen_ndr/ndr_unixinfo.c
@@ -446,7 +446,7 @@ _PUBLIC_ void ndr_print_unixinfo_GetPWUid(struct ndr_print *ndr, const char *nam
ndr->depth--;
}
-const struct dcerpc_interface_call unixinfo_calls[] = {
+const struct ndr_interface_call unixinfo_calls[] = {
{
"unixinfo_SidToUid",
sizeof(struct unixinfo_SidToUid),
diff --git a/source3/librpc/gen_ndr/ndr_winreg.c b/source3/librpc/gen_ndr/ndr_winreg.c
index 2168167de9..d973060c1b 100644
--- a/source3/librpc/gen_ndr/ndr_winreg.c
+++ b/source3/librpc/gen_ndr/ndr_winreg.c
@@ -4099,7 +4099,7 @@ _PUBLIC_ void ndr_print_winreg_QueryMultipleValues2(struct ndr_print *ndr, const
ndr->depth--;
}
-const struct dcerpc_interface_call winreg_calls[] = {
+const struct ndr_interface_call winreg_calls[] = {
{
"winreg_OpenHKCR",
sizeof(struct winreg_OpenHKCR),
diff --git a/source3/librpc/gen_ndr/ndr_wkssvc.c b/source3/librpc/gen_ndr/ndr_wkssvc.c
index 88bc59b293..a663cb6a2b 100644
--- a/source3/librpc/gen_ndr/ndr_wkssvc.c
+++ b/source3/librpc/gen_ndr/ndr_wkssvc.c
@@ -4501,7 +4501,7 @@ _PUBLIC_ void ndr_print_WKSSVC_NETRENUMERATECOMPUTERNAMES(struct ndr_print *ndr,
ndr->depth--;
}
-const struct dcerpc_interface_call wkssvc_calls[] = {
+const struct ndr_interface_call wkssvc_calls[] = {
{
"wkssvc_NetWkstaGetInfo",
sizeof(struct wkssvc_NetWkstaGetInfo),
diff --git a/source3/librpc/ndr/libndr.h b/source3/librpc/ndr/libndr.h
index fa9c1b02b6..2d7c89dfad 100644
--- a/source3/librpc/ndr/libndr.h
+++ b/source3/librpc/ndr/libndr.h
@@ -287,6 +287,15 @@ typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, cons
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__ */
diff --git a/source3/librpc/tools/ndrdump.c b/source3/librpc/tools/ndrdump.c
index ab7853fd41..cbc97cab98 100644
--- a/source3/librpc/tools/ndrdump.c
+++ b/source3/librpc/tools/ndrdump.c
@@ -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 @@ 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 dcerpc_interface_call *f;
+ const struct ndr_interface_call *f;
const char *pipe_name, *function, *inout, *filename;
uint8_t *data;
size_t size;