diff options
| author | Jeremy Allison <jra@samba.org> | 2007-12-10 11:30:37 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-12-10 11:30:37 -0800 |
| commit | 7faee02d0d351c5c039e8f1be7e82ce3a93cbe96 (patch) | |
| tree | f79fc09f414f9873d9a985e380b6384c24d00315 /source3/services | |
| parent | 0c0054fe1615a504d103da94149d1c1729abb8e2 (diff) | |
| download | samba-7faee02d0d351c5c039e8f1be7e82ce3a93cbe96.tar.gz samba-7faee02d0d351c5c039e8f1be7e82ce3a93cbe96.tar.bz2 samba-7faee02d0d351c5c039e8f1be7e82ce3a93cbe96.zip | |
Remove the char[1024] strings from dynconfig. Replace
them with malloc'ing accessor functions. Should save a
lot of static space :-).
Jeremy.
(This used to be commit 52dc5eaef2106015b3a8b659e818bdb15ad94b05)
Diffstat (limited to 'source3/services')
| -rw-r--r-- | source3/services/services_db.c | 6 | ||||
| -rw-r--r-- | source3/services/svc_rcinit.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/services/services_db.c b/source3/services/services_db.c index 07f7aa6002..430c58f50d 100644 --- a/source3/services/services_db.c +++ b/source3/services/services_db.c @@ -197,7 +197,7 @@ static bool read_init_file( const char *servicename, struct rcinit_file_informat /* attempt the file open */ - filepath = talloc_asprintf(info, "%s/%s/%s", dyn_LIBDIR, + filepath = talloc_asprintf(info, "%s/%s/%s", get_dyn_LIBDIR(), SVCCTL_SCRIPT_DIR, servicename); if (!filepath) { TALLOC_FREE(info); @@ -275,7 +275,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", - dyn_LIBDIR, SVCCTL_SCRIPT_DIR, + get_dyn_LIBDIR(), SVCCTL_SCRIPT_DIR, builtin_svcs[i].daemon) > 0) { init_unistr2( &ipath, pstr, UNI_STR_TERMINATE ); SAFE_FREE(pstr); @@ -294,7 +294,7 @@ static void fill_service_values( const char *name, REGVAL_CTR *values ) char *pstr = NULL; struct rcinit_file_information *init_info = NULL; - if (asprintf(&pstr, "%s/%s/%s",dyn_LIBDIR, + if (asprintf(&pstr, "%s/%s/%s",get_dyn_LIBDIR(), 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 66f89f2248..b7684b951c 100644 --- 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", - dyn_LIBDIR, SVCCTL_SCRIPT_DIR, service) < 0) { + get_dyn_LIBDIR(), 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", - dyn_LIBDIR, SVCCTL_SCRIPT_DIR, service) < 0) { + get_dyn_LIBDIR(), 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", - dyn_LIBDIR, SVCCTL_SCRIPT_DIR, service) < 0) { + get_dyn_LIBDIR(), SVCCTL_SCRIPT_DIR, service) < 0) { return WERR_NOMEM; } |