r15104: Implement Samba4's tdb_name().

Volker

2 files changed, 9 insertions, 1 deletions

diff --git a/source/registry/reg_perfcount.c b/source/registry/reg_perfcount.c
index 7f9e9ad6626..385128e7b55 100644
--- a/source/registry/reg_perfcount.c
+++ b/source/registry/reg_perfcount.c
@@ -172,7 +172,7 @@ static uint32 _reg_perfcount_multi_sz_from_tdb(TDB_CONTEXT *tdb,
 		/* If a key isn't there, just bypass it -- this really shouldn't 
 		   happen unless someone's mucking around with the tdb */
 		DEBUG(3, ("_reg_perfcount_multi_sz_from_tdb: failed to find key [%s] in [%s].\n",
-			  temp, tdb->name));
+			  temp, tdb_name(tdb)));
 		return buffer_size;
 	}
 	/* First encode the name_index */
diff --git a/source/tdb/tdbutil.c b/source/tdb/tdbutil.c
index f1809229f8c..fc45fa93606 100644
--- a/source/tdb/tdbutil.c
+++ b/source/tdb/tdbutil.c
@@ -805,6 +805,14 @@ TDB_CONTEXT *tdb_open_log(const char *name, int hash_size, int tdb_flags,
 	return tdb;
 }
 
+/****************************************************************************
+  return the name of the current tdb file useful for external logging
+  functions
+****************************************************************************/
+const char *tdb_name(struct tdb_context *tdb)
+{
+	return tdb->name;
+}
 
 /****************************************************************************
  Allow tdb_delete to be used as a tdb_traversal_fn.