summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-08-18 12:25:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:29:55 -0500
commit24c594d0b3e5409f5622f3b682dcc4cda0412d01 (patch)
treed4fb08d0b6e813e3ccea41e3abe14f4420f02730 /source3
parent68821746d8f79e7480b936d215875eb17af7eccf (diff)
downloadsamba-24c594d0b3e5409f5622f3b682dcc4cda0412d01.tar.gz
samba-24c594d0b3e5409f5622f3b682dcc4cda0412d01.tar.bz2
samba-24c594d0b3e5409f5622f3b682dcc4cda0412d01.zip
r24541: merge from SAMBA_4_0:
rename struct dcerpc_endpoint_list/struct dcerpc_authservice_list into ndr_interface_string_array and move it to libndr.h metze (This used to be commit 9fec0d6c2ceaf66752baa5c8a34821bef2c5b833)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/dcerpc.h14
-rw-r--r--source3/librpc/gen_ndr/ndr_dfs.c4
-rw-r--r--source3/librpc/gen_ndr/ndr_echo.c4
-rw-r--r--source3/librpc/gen_ndr/ndr_epmapper.c4
-rw-r--r--source3/librpc/gen_ndr/ndr_eventlog.c4
-rw-r--r--source3/librpc/gen_ndr/ndr_initshutdown.c4
-rw-r--r--source3/librpc/gen_ndr/ndr_lsa.c4
-rw-r--r--source3/librpc/gen_ndr/ndr_netlogon.c4
-rw-r--r--source3/librpc/gen_ndr/ndr_srvsvc.c4
-rw-r--r--source3/librpc/gen_ndr/ndr_svcctl.c4
-rw-r--r--source3/librpc/gen_ndr/ndr_unixinfo.c4
-rw-r--r--source3/librpc/gen_ndr/ndr_winreg.c4
-rw-r--r--source3/librpc/gen_ndr/ndr_wkssvc.c4
-rw-r--r--source3/librpc/ndr/libndr.h5
14 files changed, 31 insertions, 36 deletions
diff --git a/source3/include/dcerpc.h b/source3/include/dcerpc.h
index a050dd8020..a07b5c67f0 100644
--- a/source3/include/dcerpc.h
+++ b/source3/include/dcerpc.h
@@ -1,23 +1,13 @@
/* unused. Stub to make the pidl generated NDR parsers compile */
-struct dcerpc_endpoint_list {
- uint32_t count;
- const char * const *names;
-};
-
-struct dcerpc_authservice_list {
- uint32_t count;
- const char * const *names;
-};
-
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 dcerpc_endpoint_list *endpoints;
- const struct dcerpc_authservice_list *authservices;
+ const struct ndr_interface_string_array *endpoints;
+ const struct ndr_interface_string_array *authservices;
};
struct dcerpc_interface_list {
diff --git a/source3/librpc/gen_ndr/ndr_dfs.c b/source3/librpc/gen_ndr/ndr_dfs.c
index 1ec20d562c..2f9fdeea31 100644
--- a/source3/librpc/gen_ndr/ndr_dfs.c
+++ b/source3/librpc/gen_ndr/ndr_dfs.c
@@ -5313,7 +5313,7 @@ const char * const netdfs_endpoint_strings[] = {
"ncacn_np:[\\pipe\\netdfs]",
};
-const struct dcerpc_endpoint_list netdfs_endpoints = {
+const struct ndr_interface_string_array netdfs_endpoints = {
.count = 1,
.names = netdfs_endpoint_strings
};
@@ -5322,7 +5322,7 @@ const char * const netdfs_authservice_strings[] = {
"host",
};
-const struct dcerpc_authservice_list netdfs_authservices = {
+const struct ndr_interface_string_array netdfs_authservices = {
.count = 1,
.names = netdfs_authservice_strings
};
diff --git a/source3/librpc/gen_ndr/ndr_echo.c b/source3/librpc/gen_ndr/ndr_echo.c
index a3a4e0818a..f965998104 100644
--- a/source3/librpc/gen_ndr/ndr_echo.c
+++ b/source3/librpc/gen_ndr/ndr_echo.c
@@ -1430,7 +1430,7 @@ const char * const rpcecho_endpoint_strings[] = {
"ncalrpc:",
};
-const struct dcerpc_endpoint_list rpcecho_endpoints = {
+const struct ndr_interface_string_array rpcecho_endpoints = {
.count = 3,
.names = rpcecho_endpoint_strings
};
@@ -1439,7 +1439,7 @@ const char * const rpcecho_authservice_strings[] = {
"host",
};
-const struct dcerpc_authservice_list rpcecho_authservices = {
+const struct ndr_interface_string_array rpcecho_authservices = {
.count = 3,
.names = rpcecho_authservice_strings
};
diff --git a/source3/librpc/gen_ndr/ndr_epmapper.c b/source3/librpc/gen_ndr/ndr_epmapper.c
index 6e26533b55..23a3a6e437 100644
--- a/source3/librpc/gen_ndr/ndr_epmapper.c
+++ b/source3/librpc/gen_ndr/ndr_epmapper.c
@@ -2656,7 +2656,7 @@ const char * const epmapper_endpoint_strings[] = {
"ncalrpc:[EPMAPPER]",
};
-const struct dcerpc_endpoint_list epmapper_endpoints = {
+const struct ndr_interface_string_array epmapper_endpoints = {
.count = 3,
.names = epmapper_endpoint_strings
};
@@ -2665,7 +2665,7 @@ const char * const epmapper_authservice_strings[] = {
"host",
};
-const struct dcerpc_authservice_list epmapper_authservices = {
+const struct ndr_interface_string_array epmapper_authservices = {
.count = 3,
.names = epmapper_authservice_strings
};
diff --git a/source3/librpc/gen_ndr/ndr_eventlog.c b/source3/librpc/gen_ndr/ndr_eventlog.c
index 9f7294819c..fcd4c99400 100644
--- a/source3/librpc/gen_ndr/ndr_eventlog.c
+++ b/source3/librpc/gen_ndr/ndr_eventlog.c
@@ -1614,7 +1614,7 @@ const char * const eventlog_endpoint_strings[] = {
"ncacn_np:[\\pipe\\eventlog]",
};
-const struct dcerpc_endpoint_list eventlog_endpoints = {
+const struct ndr_interface_string_array eventlog_endpoints = {
.count = 1,
.names = eventlog_endpoint_strings
};
@@ -1623,7 +1623,7 @@ const char * const eventlog_authservice_strings[] = {
"host",
};
-const struct dcerpc_authservice_list eventlog_authservices = {
+const struct ndr_interface_string_array eventlog_authservices = {
.count = 1,
.names = eventlog_authservice_strings
};
diff --git a/source3/librpc/gen_ndr/ndr_initshutdown.c b/source3/librpc/gen_ndr/ndr_initshutdown.c
index 76e7878ae4..882fc487bf 100644
--- a/source3/librpc/gen_ndr/ndr_initshutdown.c
+++ b/source3/librpc/gen_ndr/ndr_initshutdown.c
@@ -399,7 +399,7 @@ const char * const initshutdown_endpoint_strings[] = {
"ncacn_np:[\\pipe\\InitShutdown]",
};
-const struct dcerpc_endpoint_list initshutdown_endpoints = {
+const struct ndr_interface_string_array initshutdown_endpoints = {
.count = 1,
.names = initshutdown_endpoint_strings
};
@@ -408,7 +408,7 @@ const char * const initshutdown_authservice_strings[] = {
"host",
};
-const struct dcerpc_authservice_list initshutdown_authservices = {
+const struct ndr_interface_string_array initshutdown_authservices = {
.count = 1,
.names = initshutdown_authservice_strings
};
diff --git a/source3/librpc/gen_ndr/ndr_lsa.c b/source3/librpc/gen_ndr/ndr_lsa.c
index d6863c3fb9..49c06fb6a8 100644
--- a/source3/librpc/gen_ndr/ndr_lsa.c
+++ b/source3/librpc/gen_ndr/ndr_lsa.c
@@ -11044,7 +11044,7 @@ const char * const lsarpc_endpoint_strings[] = {
"ncalrpc:",
};
-const struct dcerpc_endpoint_list lsarpc_endpoints = {
+const struct ndr_interface_string_array lsarpc_endpoints = {
.count = 5,
.names = lsarpc_endpoint_strings
};
@@ -11053,7 +11053,7 @@ const char * const lsarpc_authservice_strings[] = {
"host",
};
-const struct dcerpc_authservice_list lsarpc_authservices = {
+const struct ndr_interface_string_array lsarpc_authservices = {
.count = 5,
.names = lsarpc_authservice_strings
};
diff --git a/source3/librpc/gen_ndr/ndr_netlogon.c b/source3/librpc/gen_ndr/ndr_netlogon.c
index 0566df8946..87d184aaae 100644
--- a/source3/librpc/gen_ndr/ndr_netlogon.c
+++ b/source3/librpc/gen_ndr/ndr_netlogon.c
@@ -13099,7 +13099,7 @@ const char * const netlogon_endpoint_strings[] = {
"ncalrpc:",
};
-const struct dcerpc_endpoint_list netlogon_endpoints = {
+const struct ndr_interface_string_array netlogon_endpoints = {
.count = 3,
.names = netlogon_endpoint_strings
};
@@ -13108,7 +13108,7 @@ const char * const netlogon_authservice_strings[] = {
"host",
};
-const struct dcerpc_authservice_list netlogon_authservices = {
+const struct ndr_interface_string_array netlogon_authservices = {
.count = 3,
.names = netlogon_authservice_strings
};
diff --git a/source3/librpc/gen_ndr/ndr_srvsvc.c b/source3/librpc/gen_ndr/ndr_srvsvc.c
index 76c542c675..7a67155b97 100644
--- a/source3/librpc/gen_ndr/ndr_srvsvc.c
+++ b/source3/librpc/gen_ndr/ndr_srvsvc.c
@@ -19539,7 +19539,7 @@ const char * const srvsvc_endpoint_strings[] = {
"ncalrpc:",
};
-const struct dcerpc_endpoint_list srvsvc_endpoints = {
+const struct ndr_interface_string_array srvsvc_endpoints = {
.count = 3,
.names = srvsvc_endpoint_strings
};
@@ -19548,7 +19548,7 @@ const char * const srvsvc_authservice_strings[] = {
"host",
};
-const struct dcerpc_authservice_list srvsvc_authservices = {
+const struct ndr_interface_string_array srvsvc_authservices = {
.count = 3,
.names = srvsvc_authservice_strings
};
diff --git a/source3/librpc/gen_ndr/ndr_svcctl.c b/source3/librpc/gen_ndr/ndr_svcctl.c
index ed3b96ae27..823676bda9 100644
--- a/source3/librpc/gen_ndr/ndr_svcctl.c
+++ b/source3/librpc/gen_ndr/ndr_svcctl.c
@@ -5652,7 +5652,7 @@ const char * const svcctl_endpoint_strings[] = {
"ncalrpc:",
};
-const struct dcerpc_endpoint_list svcctl_endpoints = {
+const struct ndr_interface_string_array svcctl_endpoints = {
.count = 2,
.names = svcctl_endpoint_strings
};
@@ -5661,7 +5661,7 @@ const char * const svcctl_authservice_strings[] = {
"host",
};
-const struct dcerpc_authservice_list svcctl_authservices = {
+const struct ndr_interface_string_array svcctl_authservices = {
.count = 2,
.names = svcctl_authservice_strings
};
diff --git a/source3/librpc/gen_ndr/ndr_unixinfo.c b/source3/librpc/gen_ndr/ndr_unixinfo.c
index cec9c18945..a1866ae88c 100644
--- a/source3/librpc/gen_ndr/ndr_unixinfo.c
+++ b/source3/librpc/gen_ndr/ndr_unixinfo.c
@@ -496,7 +496,7 @@ const char * const unixinfo_endpoint_strings[] = {
"ncalrpc:",
};
-const struct dcerpc_endpoint_list unixinfo_endpoints = {
+const struct ndr_interface_string_array unixinfo_endpoints = {
.count = 3,
.names = unixinfo_endpoint_strings
};
@@ -505,7 +505,7 @@ const char * const unixinfo_authservice_strings[] = {
"host",
};
-const struct dcerpc_authservice_list unixinfo_authservices = {
+const struct ndr_interface_string_array unixinfo_authservices = {
.count = 3,
.names = unixinfo_authservice_strings
};
diff --git a/source3/librpc/gen_ndr/ndr_winreg.c b/source3/librpc/gen_ndr/ndr_winreg.c
index d973060c1b..82381e1555 100644
--- a/source3/librpc/gen_ndr/ndr_winreg.c
+++ b/source3/librpc/gen_ndr/ndr_winreg.c
@@ -4389,7 +4389,7 @@ const char * const winreg_endpoint_strings[] = {
"ncalrpc:",
};
-const struct dcerpc_endpoint_list winreg_endpoints = {
+const struct ndr_interface_string_array winreg_endpoints = {
.count = 3,
.names = winreg_endpoint_strings
};
@@ -4398,7 +4398,7 @@ const char * const winreg_authservice_strings[] = {
"host",
};
-const struct dcerpc_authservice_list winreg_authservices = {
+const struct ndr_interface_string_array winreg_authservices = {
.count = 3,
.names = winreg_authservice_strings
};
diff --git a/source3/librpc/gen_ndr/ndr_wkssvc.c b/source3/librpc/gen_ndr/ndr_wkssvc.c
index a663cb6a2b..cb61076721 100644
--- a/source3/librpc/gen_ndr/ndr_wkssvc.c
+++ b/source3/librpc/gen_ndr/ndr_wkssvc.c
@@ -4757,7 +4757,7 @@ const char * const wkssvc_endpoint_strings[] = {
"ncacn_np:[\\pipe\\wkssvc]",
};
-const struct dcerpc_endpoint_list wkssvc_endpoints = {
+const struct ndr_interface_string_array wkssvc_endpoints = {
.count = 1,
.names = wkssvc_endpoint_strings
};
@@ -4766,7 +4766,7 @@ const char * const wkssvc_authservice_strings[] = {
"host",
};
-const struct dcerpc_authservice_list wkssvc_authservices = {
+const struct ndr_interface_string_array wkssvc_authservices = {
.count = 1,
.names = wkssvc_authservice_strings
};
diff --git a/source3/librpc/ndr/libndr.h b/source3/librpc/ndr/libndr.h
index 2d7c89dfad..5902bbd2bc 100644
--- a/source3/librpc/ndr/libndr.h
+++ b/source3/librpc/ndr/libndr.h
@@ -296,6 +296,11 @@ struct ndr_interface_call {
BOOL async;
};
+struct ndr_interface_string_array {
+ uint32_t count;
+ const char * const *names;
+};
+
#include "dcerpc.h"
#endif /* __LIBNDR_H__ */