From a3ee831f2dda047d32750a8c7b4a30b6b7eb7519 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 2 Feb 2011 11:47:37 +0100
Subject: s3-perfcount: Create the directory on tdb open.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Günther Deschner <gd@samba.org>
---
 source3/registry/reg_init_full.c |  3 ---
 source3/registry/reg_perfcount.c | 20 +++++---------------
 source3/registry/reg_perfcount.h |  1 -
 3 files changed, 5 insertions(+), 19 deletions(-)

(limited to 'source3')

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