diff options
| author | Andreas Schneider <asn@samba.org> | 2011-02-02 11:47:37 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-02-07 12:32:02 +0100 |
| commit | a3ee831f2dda047d32750a8c7b4a30b6b7eb7519 (patch) | |
| tree | 44f71b5cba94780db8bf00921fbe64cd0d34bbf4 | |
| parent | 1c6276ce7a917d7599205e7b3f9640811c0be24b (diff) | |
| download | samba-a3ee831f2dda047d32750a8c7b4a30b6b7eb7519.tar.gz samba-a3ee831f2dda047d32750a8c7b4a30b6b7eb7519.tar.bz2 samba-a3ee831f2dda047d32750a8c7b4a30b6b7eb7519.zip | |
s3-perfcount: Create the directory on tdb open.
Signed-off-by: Günther Deschner <gd@samba.org>
| -rw-r--r-- | source3/registry/reg_init_full.c | 3 | ||||
| -rw-r--r-- | source3/registry/reg_perfcount.c | 20 | ||||
| -rw-r--r-- | source3/registry/reg_perfcount.h | 1 |
3 files changed, 5 insertions, 19 deletions
diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c index f14ffd0709..e63dd9283d 100644 --- a/source3/registry/reg_init_full.c +++ b/source3/registry/reg_init_full.c @@ -95,9 +95,6 @@ WERROR registry_init_full(void) if ( DEBUGLEVEL >= 20 ) reghook_dump_cache(20); - /* add any keys for other services */ - perfcount_init_keys(); - fail: /* close and let each smbd open up as necessary */ regdb_close(); diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c index 6a9c1af61b..d660dd0565 100644 --- a/source3/registry/reg_perfcount.c +++ b/source3/registry/reg_perfcount.c @@ -44,6 +44,11 @@ static char *counters_directory(const char *dbname) char *ret = NULL; TALLOC_CTX *ctx = talloc_tos(); + path = state_path(PERFCOUNTDIR); + if (!directory_exist(path)) { + mkdir(path, 0755); + } + path = talloc_asprintf(ctx, "%s/%s", PERFCOUNTDIR, dbname); if (!path) { return NULL; @@ -57,21 +62,6 @@ static char *counters_directory(const char *dbname) /********************************************************************* *********************************************************************/ -void perfcount_init_keys( void ) -{ - char *p = state_path(PERFCOUNTDIR); - - /* no registry keys; just create the perfmon directory */ - - if ( !directory_exist( p ) ) - mkdir( p, 0755 ); - - return; -} - -/********************************************************************* -*********************************************************************/ - uint32 reg_perfcount_get_base_index(void) { const char *fname = counters_directory( NAMES_DB ); diff --git a/source3/registry/reg_perfcount.h b/source3/registry/reg_perfcount.h index 671153f21c..515790ac52 100644 --- a/source3/registry/reg_perfcount.h +++ b/source3/registry/reg_perfcount.h @@ -24,7 +24,6 @@ #include "reg_parse_prs.h" -void perfcount_init_keys( void ); uint32 reg_perfcount_get_base_index(void); uint32 reg_perfcount_get_last_counter(uint32 base_index); uint32 reg_perfcount_get_last_help(uint32 last_counter); |