aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-09-24 21:03:40 -0700
committerGuy Harris <guy@alum.mit.edu>2017-09-25 04:04:34 +0000
commita19fdccf51383c6a34eaeba674cc961bd51f6794 (patch)
tree7791e775625575c2bb73864c03022fcb28b0e190 /tools
parentad0417cb78f207b26fa6a2115e86be7a01656d73 (diff)
pidl: Use a static const initialised struct in dcerpc_server_$name_init(void)
Pick up change from Samba: commit 778fc58eb281e38eb1a3346b58cfdf9682f104c4 Author: Andrew Bartlett <abartlet@samba.org> Date: Mon Nov 21 11:38:24 2016 +1300 pidl: Use a static const initialised struct in dcerpc_server_$name_init(void) Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Change-Id: I5bbc8cfdd94f4c13250fc3b1cb0a61351220116c Reviewed-on: https://code.wireshark.org/review/23701 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tools')
-rw-r--r--tools/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm17
1 files changed, 8 insertions, 9 deletions
diff --git a/tools/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm b/tools/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
index 0ffed39394..70778640f0 100644
--- a/tools/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
+++ b/tools/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
@@ -257,17 +257,16 @@ static bool $name\__op_interface_by_name(struct dcesrv_interface *iface, const c
NTSTATUS dcerpc_server_$name\_init(void)
{
NTSTATUS ret;
- struct dcesrv_endpoint_server ep_server;
+ static const struct dcesrv_endpoint_server ep_server = {
+ /* fill in our name */
+ .name = \"$name\",
- /* fill in our name */
- ep_server.name = \"$name\";
-
- /* fill in all the operations */
- ep_server.init_server = $name\__op_init_server;
-
- ep_server.interface_by_uuid = $name\__op_interface_by_uuid;
- ep_server.interface_by_name = $name\__op_interface_by_name;
+ /* fill in all the operations */
+ .init_server = $name\__op_init_server,
+ .interface_by_uuid = $name\__op_interface_by_uuid,
+ .interface_by_name = $name\__op_interface_by_name
+ };
/* register ourselves with the DCERPC subsystem. */
ret = dcerpc_register_ep_server(&ep_server);