tdb_compat: adapt to tdb2 API change.

Add the ecode arg to all the log functions, and log it.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/lib/ldb/ldb_tdb/ldb_tdb_wrap.c b/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
index 16a037a6c3364ee6db9a8cc76653d48a253a848f..3ddcba5cea9da55432a27670979dda7a04911718 100644 (file)
--- a/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
+++ b/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
@@ -28,6 +28,7 @@
 #if BUILD_TDB2
 static void ltdb_log_fn(struct tdb_context *tdb,
                        enum tdb_log_level level,
+                       enum TDB_ERROR ecode,
                        const char *message,
                        struct ldb_context *ldb)
 {
@@ -45,7 +46,8 @@ static void ltdb_log_fn(struct tdb_context *tdb,
                ldb_level = LDB_DEBUG_FATAL;
        }
 
-       ldb_debug(ldb, ldb_level, "ltdb: tdb(%s): %s", name, message);
+       ldb_debug(ldb, ldb_level, "ltdb: tdb(%s): %s: %s", name,
+                 tdb_errorstr(ecode), message);
 }
 #else /* !TDB2 */
 static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);

diff --git a/lib/tdb2/pytdb.c b/lib/tdb2/pytdb.c
index c760045508c3e624ed9f4bbe197dfbf1db749668..c03f00d58cbc97f67513b19c59e38bd78cf4f5b5 100644 (file)
--- a/lib/tdb2/pytdb.c
+++ b/lib/tdb2/pytdb.c
@@ -74,10 +74,12 @@ static PyObject *PyString_FromTDB_DATA(TDB_DATA data)
 
 static void stderr_log(struct tdb_context *tdb,
                       enum tdb_log_level level,
+                      enum TDB_ERROR ecode,
                       const char *message,
                       void *data)
 {
-       fprintf(stderr, "%s:%s\n", tdb_name(tdb), message);
+       fprintf(stderr, "%s:%s:%s\n",
+               tdb_name(tdb), tdb_errorstr(ecode), message);
 }
 
 static PyObject *py_tdb_open(PyTypeObject *type, PyObject *args, PyObject *kwargs)

diff --git a/lib/tdb_compat/tdb_compat.c b/lib/tdb_compat/tdb_compat.c
index a9173fc33d0c79cca35cb130c125c8d3c642b3a3..d736db1742e2d99b60ea3bfeaa47df00b03c9847 100644 (file)
--- a/lib/tdb_compat/tdb_compat.c
+++ b/lib/tdb_compat/tdb_compat.c
@@ -69,6 +69,7 @@ tdb_open_compat_(const char *name, int hash_size_unused,
                 int tdb_flags, int open_flags, mode_t mode,
                 void (*log_fn)(struct tdb_context *,
                                enum tdb_log_level,
+                               enum TDB_ERROR,
                                const char *message,
                                void *data),
                 void *log_data)

diff --git a/lib/tdb_compat/tdb_compat.h b/lib/tdb_compat/tdb_compat.h
index ea401cba498764d27a8cef86f6262cd641245dc1..80fc3cef8033817afb6990095ad6afa64b4fa296 100644 (file)
--- a/lib/tdb_compat/tdb_compat.h
+++ b/lib/tdb_compat/tdb_compat.h
@@ -90,6 +90,7 @@ enum TDB_ERROR tdb_transaction_start_nonblock(struct tdb_context *tdb);
                                             (log_fn), (log_data),      \
                                             struct tdb_context *,      \
                                             enum tdb_log_level,        \
+                                            enum TDB_ERROR,            \
                                             const char *),             \
                         (log_data))
 
@@ -98,6 +99,7 @@ tdb_open_compat_(const char *name, int hash_size_unused,
                 int tdb_flags, int open_flags, mode_t mode,
                 void (*log_fn)(struct tdb_context *,
                                enum tdb_log_level,
+                               enum TDB_ERROR ecode,
                                const char *message,
                                void *data),
                 void *log_data);

diff --git a/lib/util/tdb_wrap.c b/lib/util/tdb_wrap.c
index 71aea5e36cb469edec13b1338006877aacf7d6b9..a3dc76d6b73216dc07ca5f82da95199af1bab202 100644 (file)
--- a/lib/util/tdb_wrap.c
+++ b/lib/util/tdb_wrap.c
@@ -27,6 +27,7 @@
 #if BUILD_TDB2
 static void tdb_wrap_log(struct tdb_context *tdb,
                         enum tdb_log_level level,
+                        enum TDB_ERROR ecode,
                         const char *message,
                         void *unused)
 {
@@ -45,7 +46,8 @@ static void tdb_wrap_log(struct tdb_context *tdb,
                dl = 0;
        }
 
-       DEBUG(dl, ("tdb(%s): %s", name ? name : "unnamed", message));
+       DEBUG(dl, ("tdb(%s):%s: %s", name ? name : "unnamed",
+                  tdb_errorstr(ecode), message));
 }
 #else
 /*

diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c
index 93842e41266e9e33cb918a03b673e4a16b506cc1..1ba5ed4120cc384189deb878187f5c35ff1007c0 100644 (file)
--- a/source3/lib/util_tdb.c
+++ b/source3/lib/util_tdb.c
@@ -472,10 +472,11 @@ int tdb_unpack(const uint8 *buf, int bufsize, const char *fmt, ...)
 
 #ifdef BUILD_TDB2
 static void tdb_log(TDB_CONTEXT *tdb, enum tdb_log_level level,
-                   const char *message, void *unused)
+                   enum TDB_ERROR ecode, const char *message, void *unused)
 {
-       DEBUG((int)level, ("tdb(%s): %s",
-                          tdb_name(tdb) ? tdb_name(tdb) : "unnamed", message));
+       DEBUG((int)level, ("tdb(%s):%s: %s",
+                          tdb_name(tdb) ? tdb_name(tdb) : "unnamed",
+                          tdb_errorstr(ecode), message));
 }
 #else
 static void tdb_log(TDB_CONTEXT *tdb, enum tdb_debug_level level, const char *format, ...)