svcctl: use MODULESDIR instead of LIBDIR for the svcctl script directory.

Michael
(This used to be commit bb19634138cfd1f527c44e16a44aa21ebee50c1c)

diff --git a/source3/services/services_db.c b/source3/services/services_db.c
index 620b03693263c6eba297a5e2ecf72e0b32af94f7..49761c32334106796b70cdc15bdc9eedd982d004 100644 (file)
--- a/source3/services/services_db.c
+++ b/source3/services/services_db.c
@@ -199,7 +199,7 @@ static bool read_init_file( const char *servicename, struct rcinit_file_informat
 
        /* attempt the file open */
 
-       filepath = talloc_asprintf(info, "%s/%s/%s", get_dyn_LIBDIR(),
+       filepath = talloc_asprintf(info, "%s/%s/%s", get_dyn_MODULESDIR(),
                                SVCCTL_SCRIPT_DIR, servicename);
        if (!filepath) {
                TALLOC_FREE(info);
@@ -277,7 +277,7 @@ static void fill_service_values( const char *name, REGVAL_CTR *values )
                if ( strequal( name, builtin_svcs[i].servicename ) ) {
                        char *pstr = NULL;
                        if (asprintf(&pstr, "%s/%s/%s",
-                                       get_dyn_LIBDIR(), SVCCTL_SCRIPT_DIR,
+                                       get_dyn_MODULESDIR(), SVCCTL_SCRIPT_DIR,
                                        builtin_svcs[i].daemon) > 0) {
                                init_unistr2( &ipath, pstr, UNI_STR_TERMINATE );
                                SAFE_FREE(pstr);
@@ -297,7 +297,7 @@ static void fill_service_values( const char *name, REGVAL_CTR *values )
                char *dispname = NULL;
                struct rcinit_file_information *init_info = NULL;
 
-               if (asprintf(&pstr, "%s/%s/%s",get_dyn_LIBDIR(),
+               if (asprintf(&pstr, "%s/%s/%s",get_dyn_MODULESDIR(),
                                        SVCCTL_SCRIPT_DIR, name) > 0) {
                        init_unistr2( &ipath, pstr, UNI_STR_TERMINATE );
                        SAFE_FREE(pstr);

diff --git a/source3/services/svc_rcinit.c b/source3/services/svc_rcinit.c
index b7684b951c1c398e8994e9bd3b176c669e13edb9..3d9e6673a05be9b73011705289faaa072b2a37a9 100644 (file)
--- a/source3/services/svc_rcinit.c
+++ b/source3/services/svc_rcinit.c
@@ -28,7 +28,7 @@ static WERROR rcinit_stop( const char *service, SERVICE_STATUS *status )
        int ret, fd;
 
        if (asprintf(&command, "%s/%s/%s stop",
-                               get_dyn_LIBDIR(), SVCCTL_SCRIPT_DIR, service) < 0) {
+                               get_dyn_MODULESDIR(), SVCCTL_SCRIPT_DIR, service) < 0) {
                return WERR_NOMEM;
        }
 
@@ -60,7 +60,7 @@ static WERROR rcinit_start( const char *service )
        int ret, fd;
 
        if (asprintf(&command, "%s/%s/%s start",
-                               get_dyn_LIBDIR(), SVCCTL_SCRIPT_DIR, service) < 0) {
+                               get_dyn_MODULESDIR(), SVCCTL_SCRIPT_DIR, service) < 0) {
                return WERR_NOMEM;
        }
 
@@ -87,7 +87,7 @@ static WERROR rcinit_status( const char *service, SERVICE_STATUS *status )
        int ret, fd;
 
        if (asprintf(&command, "%s/%s/%s status",
-                               get_dyn_LIBDIR(), SVCCTL_SCRIPT_DIR, service) < 0) {
+                               get_dyn_MODULESDIR(), SVCCTL_SCRIPT_DIR, service) < 0) {
                return WERR_NOMEM;
        }