svn commit: samba r24541 - in branches/SAMBA_3_2/source: include
librpc/gen_ndr librpc/ndr
metze at samba.org
metze at samba.org
Sat Aug 18 12:26:04 GMT 2007
Author: metze
Date: 2007-08-18 12:25:59 +0000 (Sat, 18 Aug 2007)
New Revision: 24541
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24541
Log:
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
Modified:
branches/SAMBA_3_2/source/include/dcerpc.h
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_dfs.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_echo.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_epmapper.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_eventlog.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_initshutdown.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_lsa.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_netlogon.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_srvsvc.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_unixinfo.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_winreg.c
branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_wkssvc.c
branches/SAMBA_3_2/source/librpc/ndr/libndr.h
Changeset:
Modified: branches/SAMBA_3_2/source/include/dcerpc.h
===================================================================
--- branches/SAMBA_3_2/source/include/dcerpc.h 2007-08-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/include/dcerpc.h 2007-08-18 12:25:59 UTC (rev 24541)
@@ -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 {
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-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_dfs.c 2007-08-18 12:25:59 UTC (rev 24541)
@@ -5313,7 +5313,7 @@
"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 @@
"host",
};
-const struct dcerpc_authservice_list netdfs_authservices = {
+const struct ndr_interface_string_array netdfs_authservices = {
.count = 1,
.names = netdfs_authservice_strings
};
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-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_echo.c 2007-08-18 12:25:59 UTC (rev 24541)
@@ -1430,7 +1430,7 @@
"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 @@
"host",
};
-const struct dcerpc_authservice_list rpcecho_authservices = {
+const struct ndr_interface_string_array rpcecho_authservices = {
.count = 3,
.names = rpcecho_authservice_strings
};
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-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_epmapper.c 2007-08-18 12:25:59 UTC (rev 24541)
@@ -2656,7 +2656,7 @@
"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 @@
"host",
};
-const struct dcerpc_authservice_list epmapper_authservices = {
+const struct ndr_interface_string_array epmapper_authservices = {
.count = 3,
.names = epmapper_authservice_strings
};
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-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_eventlog.c 2007-08-18 12:25:59 UTC (rev 24541)
@@ -1614,7 +1614,7 @@
"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 @@
"host",
};
-const struct dcerpc_authservice_list eventlog_authservices = {
+const struct ndr_interface_string_array eventlog_authservices = {
.count = 1,
.names = eventlog_authservice_strings
};
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-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_initshutdown.c 2007-08-18 12:25:59 UTC (rev 24541)
@@ -399,7 +399,7 @@
"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 @@
"host",
};
-const struct dcerpc_authservice_list initshutdown_authservices = {
+const struct ndr_interface_string_array initshutdown_authservices = {
.count = 1,
.names = initshutdown_authservice_strings
};
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-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_lsa.c 2007-08-18 12:25:59 UTC (rev 24541)
@@ -11044,7 +11044,7 @@
"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 @@
"host",
};
-const struct dcerpc_authservice_list lsarpc_authservices = {
+const struct ndr_interface_string_array lsarpc_authservices = {
.count = 5,
.names = lsarpc_authservice_strings
};
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-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_netlogon.c 2007-08-18 12:25:59 UTC (rev 24541)
@@ -13099,7 +13099,7 @@
"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 @@
"host",
};
-const struct dcerpc_authservice_list netlogon_authservices = {
+const struct ndr_interface_string_array netlogon_authservices = {
.count = 3,
.names = netlogon_authservice_strings
};
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-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_srvsvc.c 2007-08-18 12:25:59 UTC (rev 24541)
@@ -19539,7 +19539,7 @@
"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 @@
"host",
};
-const struct dcerpc_authservice_list srvsvc_authservices = {
+const struct ndr_interface_string_array srvsvc_authservices = {
.count = 3,
.names = srvsvc_authservice_strings
};
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-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_svcctl.c 2007-08-18 12:25:59 UTC (rev 24541)
@@ -5652,7 +5652,7 @@
"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 @@
"host",
};
-const struct dcerpc_authservice_list svcctl_authservices = {
+const struct ndr_interface_string_array svcctl_authservices = {
.count = 2,
.names = svcctl_authservice_strings
};
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-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_unixinfo.c 2007-08-18 12:25:59 UTC (rev 24541)
@@ -496,7 +496,7 @@
"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 @@
"host",
};
-const struct dcerpc_authservice_list unixinfo_authservices = {
+const struct ndr_interface_string_array unixinfo_authservices = {
.count = 3,
.names = unixinfo_authservice_strings
};
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-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_winreg.c 2007-08-18 12:25:59 UTC (rev 24541)
@@ -4389,7 +4389,7 @@
"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 @@
"host",
};
-const struct dcerpc_authservice_list winreg_authservices = {
+const struct ndr_interface_string_array winreg_authservices = {
.count = 3,
.names = winreg_authservice_strings
};
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-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/librpc/gen_ndr/ndr_wkssvc.c 2007-08-18 12:25:59 UTC (rev 24541)
@@ -4757,7 +4757,7 @@
"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 @@
"host",
};
-const struct dcerpc_authservice_list wkssvc_authservices = {
+const struct ndr_interface_string_array wkssvc_authservices = {
.count = 1,
.names = wkssvc_authservice_strings
};
Modified: branches/SAMBA_3_2/source/librpc/ndr/libndr.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/ndr/libndr.h 2007-08-18 12:25:37 UTC (rev 24540)
+++ branches/SAMBA_3_2/source/librpc/ndr/libndr.h 2007-08-18 12:25:59 UTC (rev 24541)
@@ -296,6 +296,11 @@
BOOL async;
};
+struct ndr_interface_string_array {
+ uint32_t count;
+ const char * const *names;
+};
+
#include "dcerpc.h"
#endif /* __LIBNDR_H__ */
More information about the samba-cvs
mailing list