sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

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

Browse Source 
Michael
(This used to be commit bb19634138)
This commit is contained in:
Michael Adam 2008-08-15 00:50:56 +02:00
parent 8dadf4b949
commit 8829b424fe
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/services/services_db.c
View File

@ -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);

6
source3/services/svc_rcinit.c
View File

@ -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;
}