From: Günther Deschner <gd@samba.org>
Date: Wed, 4 Mar 2020 12:47:13 +0000 (+0100)
Subject: svcctl: unify operation names and always prefix with svcctl_
X-Git-Tag: talloc-2.4.2~809
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d8867925f1f76935675266e39714b22794cd59e;p=thirdparty%2Fsamba.git

svcctl: unify operation names and always prefix with svcctl_

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/librpc/idl/svcctl.idl b/librpc/idl/svcctl.idl
index a9dd3dec990..e43685debb8 100644
--- a/librpc/idl/svcctl.idl
+++ b/librpc/idl/svcctl.idl
@@ -638,7 +638,7 @@ import "misc.idl", "security.idl";
 
 	/*****************/
 	/* Function 0x29 */
-	WERROR EnumServicesStatusExA(
+	WERROR svcctl_EnumServicesStatusExA(
 		[in,ref] policy_handle *scmanager,
 		[in] uint32 info_level,
 		[in] uint32 type,
@@ -653,7 +653,7 @@ import "misc.idl", "security.idl";
 
 	/*****************/
 	/* Function 0x2a */
-	WERROR EnumServicesStatusExW(
+	WERROR svcctl_EnumServicesStatusExW(
 		[in,ref] policy_handle *scmanager,
 		[in] uint32 info_level,
 		[in] uint32 type,
diff --git a/source3/rpc_server/svcctl/srv_svcctl_nt.c b/source3/rpc_server/svcctl/srv_svcctl_nt.c
index 7f0f2c0258c..b6ff2df197e 100644
--- a/source3/rpc_server/svcctl/srv_svcctl_nt.c
+++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c
@@ -1228,15 +1228,15 @@ WERROR _svcctl_QueryServiceConfig2A(struct pipes_struct *p,
 	return WERR_NOT_SUPPORTED;
 }
 
-WERROR _EnumServicesStatusExA(struct pipes_struct *p,
-			      struct EnumServicesStatusExA *r)
+WERROR _svcctl_EnumServicesStatusExA(struct pipes_struct *p,
+				     struct svcctl_EnumServicesStatusExA *r)
 {
 	p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
 	return WERR_NOT_SUPPORTED;
 }
 
-WERROR _EnumServicesStatusExW(struct pipes_struct *p,
-			      struct EnumServicesStatusExW *r)
+WERROR _svcctl_EnumServicesStatusExW(struct pipes_struct *p,
+				     struct svcctl_EnumServicesStatusExW *r)
 {
 	p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
 	return WERR_NOT_SUPPORTED;