diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-07-03 06:40:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:09:45 -0500 |
| commit | d3fee429aee87e9c05a4a606fbf0b60b16dac782 (patch) | |
| tree | 792984356cd682124de421c8d9852cfb7ddc8bff /source4/lib/db_wrap.c | |
| parent | fcce0991c29338a63e3e1e50815eb981a2fa113c (diff) | |
| download | samba-d3fee429aee87e9c05a4a606fbf0b60b16dac782.tar.gz samba-d3fee429aee87e9c05a4a606fbf0b60b16dac782.tar.bz2 samba-d3fee429aee87e9c05a4a606fbf0b60b16dac782.zip | |
r16774: This patch modifies the tdb API to allow the logging function to be used
as part of ldb.
This allows tdb failures to be passed all the way up to Samba's DEBUG
system, which allowed easier debugging.
Unfortunately I had to extend the tdb API, as the logging function
didn't have a context pointer.
I've worked over the 'debug levels' in TDB. Most of them were 0,
which didn't seem right, as some were trace-like messages. We didn't
see any of these previously, except when accessing TDB directly.
Andrew Bartlett
(This used to be commit 58898092c1ce043f6d698db5065f372b79109e22)
Diffstat (limited to 'source4/lib/db_wrap.c')
| -rw-r--r-- | source4/lib/db_wrap.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/source4/lib/db_wrap.c b/source4/lib/db_wrap.c index 43ad3d0fae..4a21648403 100644 --- a/source4/lib/db_wrap.c +++ b/source4/lib/db_wrap.c @@ -144,22 +144,40 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx, /* Log tdb messages via DEBUG(). */ -static void tdb_wrap_log(TDB_CONTEXT *tdb, int level, +static void tdb_wrap_log(TDB_CONTEXT *tdb, enum tdb_debug_level level, const char *format, ...) PRINTF_ATTRIBUTE(3,4); -static void tdb_wrap_log(TDB_CONTEXT *tdb, int level, +static void tdb_wrap_log(TDB_CONTEXT *tdb, enum tdb_debug_level level, const char *format, ...) { va_list ap; char *ptr = NULL; + int debug_level; va_start(ap, format); vasprintf(&ptr, format, ap); va_end(ap); + switch (level) { + case TDB_DEBUG_FATAL: + debug_level = 0; + break; + case TDB_DEBUG_ERROR: + debug_level = 1; + break; + case TDB_DEBUG_WARNING: + debug_level = 2; + break; + case TDB_DEBUG_TRACE: + debug_level = 5; + break; + default: + debug_level = 0; + } + if (ptr != NULL) { const char *name = tdb_name(tdb); - DEBUG(level, ("tdb(%s): %s", name ? name : "unnamed", ptr)); + DEBUG(debug_level, ("tdb(%s): %s", name ? name : "unnamed", ptr)); free(ptr); } } @@ -197,7 +215,7 @@ struct tdb_wrap *tdb_wrap_open(TALLOC_CTX *mem_ctx, w->name = talloc_strdup(w, name); w->tdb = tdb_open_ex(name, hash_size, tdb_flags, - open_flags, mode, tdb_wrap_log, NULL); + open_flags, mode, tdb_wrap_log, NULL, NULL); if (w->tdb == NULL) { talloc_free(w); return NULL; |