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 a9dd3dec99031241ecc945c22b027281c3ee6960..e43685debb85823f07ac622633329893a7535aa8 100644 (file)
--- 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 7f0f2c0258ce18c7d171ac05c2f90635eeeb46bd..b6ff2df197ec1d7c4e96388d2b717ac2e7d27ece 100644 (file)
--- 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;