From: Günther Deschner Date: Thu, 12 Mar 2020 12:37:28 +0000 (+0100) Subject: svcctl: rename SERVICE_FAILURE_ACTIONS to SERVICE_FAILURE_ACTIONSW X-Git-Tag: talloc-2.4.2~808 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb348e5be1158bfd45a5b0ec5b652fcf13062101;p=thirdparty%2Fsamba.git svcctl: rename SERVICE_FAILURE_ACTIONS to SERVICE_FAILURE_ACTIONSW (there will be a SERVICE_FAILURE_ACTIONSA variant also) Guenther Signed-off-by: Günther Deschner Reviewed-by: Andrew Bartlett --- diff --git a/librpc/idl/svcctl.idl b/librpc/idl/svcctl.idl index e43685debb8..b43be6547d6 100644 --- a/librpc/idl/svcctl.idl +++ b/librpc/idl/svcctl.idl @@ -601,7 +601,7 @@ import "misc.idl", "security.idl"; [relative] nstring *command; [range(0,1024)] uint32 num_actions; [relative] [size_is(num_actions)] SC_ACTION *actions; - } SERVICE_FAILURE_ACTIONS; + } SERVICE_FAILURE_ACTIONSW; WERROR svcctl_QueryServiceConfig2A( [in,ref] policy_handle *handle, diff --git a/source3/rpc_server/svcctl/srv_svcctl_nt.c b/source3/rpc_server/svcctl/srv_svcctl_nt.c index b6ff2df197e..2694e9e140d 100644 --- a/source3/rpc_server/svcctl/srv_svcctl_nt.c +++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c @@ -856,7 +856,7 @@ WERROR _svcctl_QueryServiceConfig2W(struct pipes_struct *p, break; case SERVICE_CONFIG_FAILURE_ACTIONS: { - struct SERVICE_FAILURE_ACTIONS actions; + struct SERVICE_FAILURE_ACTIONSW actions; enum ndr_err_code ndr_err; /* nothing to say...just service the request */ @@ -864,7 +864,7 @@ WERROR _svcctl_QueryServiceConfig2W(struct pipes_struct *p, ZERO_STRUCT( actions ); ndr_err = ndr_push_struct_blob(&blob, p->mem_ctx, &actions, - (ndr_push_flags_fn_t)ndr_push_SERVICE_FAILURE_ACTIONS); + (ndr_push_flags_fn_t)ndr_push_SERVICE_FAILURE_ACTIONSW); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { return WERR_INVALID_PARAMETER; }