lib: Use tdb_data_dbg() where appropriate

This changes the talloc hierarchy for a few callers, but as
talloc_tos() was initially designed exactly for this purpose (printing
SIDs in DEBUG), it should be okay.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 3c27a63d8d5c7c6c583c320b43c76c1252fc39ae..d3f049d43bbcdc87ae384f292e8f2db3bda58258 100644 (file)
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -1469,9 +1469,7 @@ static void g_lock_writev_data_fn(
        ok = g_lock_parse(value.dptr, value.dsize, &lck);
        if (!ok) {
                DBG_DEBUG("g_lock_parse for %s failed\n",
-                         hex_encode_talloc(talloc_tos(),
-                                           state->key.dptr,
-                                           state->key.dsize));
+                         tdb_data_dbg(state->key));
                state->status = NT_STATUS_INTERNAL_DB_CORRUPTION;
                return;
        }
@@ -1604,9 +1602,7 @@ static void g_lock_dump_fn(TDB_DATA key, TDB_DATA data,
        ok = g_lock_parse(data.dptr, data.dsize, &lck);
        if (!ok) {
                DBG_DEBUG("g_lock_parse failed for %s\n",
-                         hex_encode_talloc(talloc_tos(),
-                                           state->key.dptr,
-                                           state->key.dsize));
+                         tdb_data_dbg(state->key));
                state->status = NT_STATUS_INTERNAL_DB_CORRUPTION;
                return;
        }

diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index e123084677dff9fbbc533e303eb73033ce7ba9b0..09a028535111f08b374f56fc7d60c8edf4085476 100644 (file)
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -775,7 +775,7 @@ static bool share_mode_g_lock_within_cb(TDB_DATA key)
                DBG_ERR("Can not lock two share modes "
                        "simultaneously: existing %s requested %s\n",
                        file_id_str_buf(share_mode_lock_key_id, &existing),
-                       hex_encode_talloc(talloc_tos(), key.dptr, key.dsize));
+                       tdb_data_dbg(key));
                smb_panic(__location__);
                return false;
        }

diff --git a/source3/smbd/smbXsrv_client.c b/source3/smbd/smbXsrv_client.c
index 292690efb173a016949e192c28f5e42f88599e8f..f5b296f65d2f9c0a0f6ec8139bd50b719f016917 100644 (file)
--- a/source3/smbd/smbXsrv_client.c
+++ b/source3/smbd/smbXsrv_client.c
@@ -39,6 +39,7 @@
 #include "lib/util/tevent_ntstatus.h"
 #include "lib/util/iov_buf.h"
 #include "lib/global_contexts.h"
+#include "source3/include/util_tdb.h"
 
 struct smbXsrv_client_table {
        struct {
@@ -143,7 +144,7 @@ static struct db_record *smbXsrv_client_global_fetch_locked(
                struct GUID_txt_buf buf;
                DBG_DEBUG("Failed to lock guid [%s], key '%s'\n",
                          GUID_buf_string(client_guid, &buf),
-                         hex_encode_talloc(talloc_tos(), key.dptr, key.dsize));
+                         tdb_data_dbg(key));
        }
 
        return rec;
@@ -234,7 +235,7 @@ static void smbXsrv_client_global_verify_record(struct db_record *db_rec,
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
                DBG_WARNING("key '%s' ndr_pull_struct_blob - %s\n",
-                           hex_encode_talloc(frame, key.dptr, key.dsize),
+                           tdb_data_dbg(key),
                            nt_errstr(status));
                TALLOC_FREE(frame);
                return;
@@ -247,7 +248,7 @@ static void smbXsrv_client_global_verify_record(struct db_record *db_rec,
 
        if (global_blob.version != SMBXSRV_VERSION_0) {
                DBG_ERR("key '%s' use unsupported version %u\n",
-                       hex_encode_talloc(frame, key.dptr, key.dsize),
+                       tdb_data_dbg(key),
                        global_blob.version);
                NDR_PRINT_DEBUG(smbXsrv_client_globalB, &global_blob);
                TALLOC_FREE(frame);
@@ -261,7 +262,7 @@ static void smbXsrv_client_global_verify_record(struct db_record *db_rec,
                struct server_id_buf tmp;
 
                DBG_NOTICE("key '%s' server_id %s is already dead.\n",
-                          hex_encode_talloc(frame, key.dptr, key.dsize),
+                          tdb_data_dbg(key),
                           server_id_str_buf(global->server_id, &tmp));
                if (DEBUGLVL(DBGLVL_NOTICE)) {
                        NDR_PRINT_DEBUG(smbXsrv_client_globalB, &global_blob);
@@ -277,7 +278,7 @@ static void smbXsrv_client_global_verify_record(struct db_record *db_rec,
                struct server_id_buf tmp;
 
                DBG_NOTICE("key '%s' server_id %s does not exist.\n",
-                          hex_encode_talloc(frame, key.dptr, key.dsize),
+                          tdb_data_dbg(key),
                           server_id_str_buf(global->server_id, &tmp));
                if (DEBUGLVL(DBGLVL_NOTICE)) {
                        NDR_PRINT_DEBUG(smbXsrv_client_globalB, &global_blob);
@@ -454,7 +455,7 @@ static NTSTATUS smbXsrv_client_global_store(struct smbXsrv_client_global0 *globa
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                status = ndr_map_error2ntstatus(ndr_err);
                DBG_WARNING("key '%s' ndr_push - %s\n",
-                       hex_encode_talloc(global->db_rec, key.dptr, key.dsize),
+                       tdb_data_dbg(key),
                        nt_errstr(status));
                TALLOC_FREE(global->db_rec);
                return status;
@@ -464,7 +465,7 @@ static NTSTATUS smbXsrv_client_global_store(struct smbXsrv_client_global0 *globa
        status = dbwrap_record_store(global->db_rec, val, TDB_REPLACE);
        if (!NT_STATUS_IS_OK(status)) {
                DBG_WARNING("key '%s' store - %s\n",
-                       hex_encode_talloc(global->db_rec, key.dptr, key.dsize),
+                       tdb_data_dbg(key),
                        nt_errstr(status));
                TALLOC_FREE(global->db_rec);
                return status;
@@ -474,7 +475,7 @@ static NTSTATUS smbXsrv_client_global_store(struct smbXsrv_client_global0 *globa
 
        if (DEBUGLVL(DBGLVL_DEBUG)) {
                DBG_DEBUG("key '%s' stored\n",
-                       hex_encode_talloc(global->db_rec, key.dptr, key.dsize));
+                         tdb_data_dbg(key));
                NDR_PRINT_DEBUG(smbXsrv_client_globalB, &global_blob);
        }
 
@@ -874,14 +875,13 @@ static NTSTATUS smbXsrv_client_global_remove(struct smbXsrv_client_global0 *glob
        status = dbwrap_record_delete(global->db_rec);
        if (!NT_STATUS_IS_OK(status)) {
                DBG_WARNING("key '%s' delete - %s\n",
-                       hex_encode_talloc(global->db_rec, key.dptr, key.dsize),
+                       tdb_data_dbg(key),
                        nt_errstr(status));
                TALLOC_FREE(global->db_rec);
                return status;
        }
        global->stored = false;
-       DBG_DEBUG("key '%s' delete\n",
-                 hex_encode_talloc(global->db_rec, key.dptr, key.dsize));
+       DBG_DEBUG("key '%s' delete\n", tdb_data_dbg(key));
 
        TALLOC_FREE(global->db_rec);
 

diff --git a/source3/smbd/smbXsrv_open.c b/source3/smbd/smbXsrv_open.c
index 0611ae8cbaaa6f2f717415221500a6ab84f9e0c5..99ca2abc3201ef0fd470013ab249080c8618f118 100644 (file)
--- a/source3/smbd/smbXsrv_open.c
+++ b/source3/smbd/smbXsrv_open.c
@@ -32,6 +32,7 @@
 #include "lib/util/util_tdb.h"
 #include "librpc/gen_ndr/ndr_smbXsrv.h"
 #include "serverid.h"
+#include "source3/include/util_tdb.h"
 
 struct smbXsrv_open_table {
        struct {
@@ -167,7 +168,7 @@ static struct db_record *smbXsrv_open_global_fetch_locked(
 
        if (rec == NULL) {
                DBG_DEBUG("Failed to lock global id 0x%08x, key '%s'\n", id,
-                         hex_encode_talloc(talloc_tos(), key.dptr, key.dsize));
+                         tdb_data_dbg(key));
        }
 
        return rec;
@@ -188,7 +189,7 @@ static struct db_record *smbXsrv_open_local_fetch_locked(
 
        if (rec == NULL) {
                DBG_DEBUG("Failed to lock local id 0x%08x, key '%s'\n", id,
-                         hex_encode_talloc(talloc_tos(), key.dptr, key.dsize));
+                         tdb_data_dbg(key));
        }
 
        return rec;
@@ -645,7 +646,7 @@ static void smbXsrv_open_global_verify_record(struct db_record *db_rec,
                NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
                DEBUG(1,("smbXsrv_open_global_verify_record: "
                         "key '%s' ndr_pull_struct_blob - %s\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         nt_errstr(status)));
                TALLOC_FREE(frame);
                return;
@@ -659,7 +660,7 @@ static void smbXsrv_open_global_verify_record(struct db_record *db_rec,
        if (global_blob.version != SMBXSRV_VERSION_0) {
                DEBUG(0,("smbXsrv_open_global_verify_record: "
                         "key '%s' use unsupported version %u\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         global_blob.version));
                NDR_PRINT_DEBUG(smbXsrv_open_globalB, &global_blob);
                TALLOC_FREE(frame);
@@ -677,7 +678,7 @@ static void smbXsrv_open_global_verify_record(struct db_record *db_rec,
                struct server_id_buf idbuf;
                DEBUG(2,("smbXsrv_open_global_verify_record: "
                         "key '%s' server_id %s does not exist.\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         server_id_str_buf(global->server_id, &idbuf)));
                if (CHECK_DEBUGLVL(2)) {
                        NDR_PRINT_DEBUG(smbXsrv_open_globalB, &global_blob);
@@ -731,7 +732,7 @@ static NTSTATUS smbXsrv_open_global_store(struct smbXsrv_open_global0 *global)
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                status = ndr_map_error2ntstatus(ndr_err);
                DEBUG(1,("smbXsrv_open_global_store: key '%s' ndr_push - %s\n",
-                        hex_encode_talloc(global->db_rec, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         nt_errstr(status)));
                TALLOC_FREE(global->db_rec);
                return status;
@@ -741,7 +742,7 @@ static NTSTATUS smbXsrv_open_global_store(struct smbXsrv_open_global0 *global)
        status = dbwrap_record_store(global->db_rec, val, TDB_REPLACE);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(1,("smbXsrv_open_global_store: key '%s' store - %s\n",
-                        hex_encode_talloc(global->db_rec, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         nt_errstr(status)));
                TALLOC_FREE(global->db_rec);
                return status;
@@ -749,7 +750,7 @@ static NTSTATUS smbXsrv_open_global_store(struct smbXsrv_open_global0 *global)
 
        if (CHECK_DEBUGLVL(10)) {
                DEBUG(10,("smbXsrv_open_global_store: key '%s' stored\n",
-                        hex_encode_talloc(global->db_rec, key.dptr, key.dsize)));
+                         tdb_data_dbg(key)));
                NDR_PRINT_DEBUG(smbXsrv_open_globalB, &global_blob);
        }
 
@@ -1158,8 +1159,7 @@ NTSTATUS smbXsrv_open_close(struct smbXsrv_open *op, NTTIME now)
                        DEBUG(0, ("smbXsrv_open_close(0x%08x): "
                                  "failed to delete global key '%s': %s\n",
                                  op->global->open_global_id,
-                                 hex_encode_talloc(global_rec, key.dptr,
-                                                   key.dsize),
+                                 tdb_data_dbg(key),
                                  nt_errstr(status)));
                        error = status;
                }
@@ -1184,8 +1184,7 @@ NTSTATUS smbXsrv_open_close(struct smbXsrv_open *op, NTTIME now)
                        DEBUG(0, ("smbXsrv_open_close(0x%08x): "
                                  "failed to delete local key '%s': %s\n",
                                  op->global->open_global_id,
-                                 hex_encode_talloc(local_rec, key.dptr,
-                                                   key.dsize),
+                                 tdb_data_dbg(key),
                                  nt_errstr(status)));
                        error = status;
                }
@@ -1630,7 +1629,7 @@ static NTSTATUS smbXsrv_open_global_parse_record(TALLOC_CTX *mem_ctx,
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                DEBUG(1,("Invalid record in smbXsrv_open_global.tdb:"
                         "key '%s' ndr_pull_struct_blob - %s\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         ndr_errstr(ndr_err)));
                status = ndr_map_error2ntstatus(ndr_err);
                goto done;
@@ -1640,7 +1639,7 @@ static NTSTATUS smbXsrv_open_global_parse_record(TALLOC_CTX *mem_ctx,
                status = NT_STATUS_INTERNAL_DB_CORRUPTION;
                DEBUG(1,("Invalid record in smbXsrv_open_global.tdb:"
                         "key '%s' unsupported version - %d - %s\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         (int)global_blob.version,
                         nt_errstr(status)));
                goto done;
@@ -1650,7 +1649,7 @@ static NTSTATUS smbXsrv_open_global_parse_record(TALLOC_CTX *mem_ctx,
                status = NT_STATUS_INTERNAL_DB_CORRUPTION;
                DEBUG(1,("Invalid record in smbXsrv_tcon_global.tdb:"
                         "key '%s' info0 NULL pointer - %s\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         nt_errstr(status)));
                goto done;
        }

diff --git a/source3/smbd/smbXsrv_session.c b/source3/smbd/smbXsrv_session.c
index 57ec395186cb0cf7a1b83ea58cafe2910ad47515..12542b29a3e4c232715026e084d0d433b06c9088 100644 (file)
--- a/source3/smbd/smbXsrv_session.c
+++ b/source3/smbd/smbXsrv_session.c
@@ -39,6 +39,7 @@
 #include "serverid.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "lib/global_contexts.h"
+#include "source3/include/util_tdb.h"
 
 struct smbXsrv_session_table {
        struct {
@@ -183,7 +184,7 @@ static struct db_record *smbXsrv_session_global_fetch_locked(
 
        if (rec == NULL) {
                DBG_DEBUG("Failed to lock global id 0x%08x, key '%s'\n", id,
-                         hex_encode_talloc(talloc_tos(), key.dptr, key.dsize));
+                         tdb_data_dbg(key));
        }
 
        return rec;
@@ -204,7 +205,7 @@ static struct db_record *smbXsrv_session_local_fetch_locked(
 
        if (rec == NULL) {
                DBG_DEBUG("Failed to lock local id 0x%08x, key '%s'\n", id,
-                         hex_encode_talloc(talloc_tos(), key.dptr, key.dsize));
+                         tdb_data_dbg(key));
        }
 
        return rec;
@@ -844,7 +845,7 @@ static void smbXsrv_session_global_verify_record(struct db_record *db_rec,
                NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
                DEBUG(1,("smbXsrv_session_global_verify_record: "
                         "key '%s' ndr_pull_struct_blob - %s\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         nt_errstr(status)));
                TALLOC_FREE(frame);
                *is_free = true;
@@ -862,7 +863,7 @@ static void smbXsrv_session_global_verify_record(struct db_record *db_rec,
        if (global_blob.version != SMBXSRV_VERSION_0) {
                DEBUG(0,("smbXsrv_session_global_verify_record: "
                         "key '%s' use unsupported version %u\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         global_blob.version));
                NDR_PRINT_DEBUG(smbXsrv_session_globalB, &global_blob);
                TALLOC_FREE(frame);
@@ -897,7 +898,7 @@ static void smbXsrv_session_global_verify_record(struct db_record *db_rec,
                struct server_id_buf idbuf;
                DEBUG(2,("smbXsrv_session_global_verify_record: "
                         "key '%s' server_id %s does not exist.\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         server_id_str_buf(global->channels[0].server_id,
                                           &idbuf)));
                if (DEBUGLVL(2)) {
@@ -953,7 +954,7 @@ static NTSTATUS smbXsrv_session_global_store(struct smbXsrv_session_global0 *glo
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                status = ndr_map_error2ntstatus(ndr_err);
                DEBUG(1,("smbXsrv_session_global_store: key '%s' ndr_push - %s\n",
-                        hex_encode_talloc(global->db_rec, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         nt_errstr(status)));
                TALLOC_FREE(global->db_rec);
                return status;
@@ -963,7 +964,7 @@ static NTSTATUS smbXsrv_session_global_store(struct smbXsrv_session_global0 *glo
        status = dbwrap_record_store(global->db_rec, val, TDB_REPLACE);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(1,("smbXsrv_session_global_store: key '%s' store - %s\n",
-                        hex_encode_talloc(global->db_rec, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         nt_errstr(status)));
                TALLOC_FREE(global->db_rec);
                return status;
@@ -971,7 +972,7 @@ static NTSTATUS smbXsrv_session_global_store(struct smbXsrv_session_global0 *glo
 
        if (DEBUGLVL(10)) {
                DEBUG(10,("smbXsrv_session_global_store: key '%s' stored\n",
-                        hex_encode_talloc(global->db_rec, key.dptr, key.dsize)));
+                         tdb_data_dbg(key)));
                NDR_PRINT_DEBUG(smbXsrv_session_globalB, &global_blob);
        }
 
@@ -1896,8 +1897,7 @@ NTSTATUS smbXsrv_session_logoff(struct smbXsrv_session *session)
                        DEBUG(0, ("smbXsrv_session_logoff(0x%08x): "
                                  "failed to delete global key '%s': %s\n",
                                  session->global->session_global_id,
-                                 hex_encode_talloc(global_rec, key.dptr,
-                                                   key.dsize),
+                                 tdb_data_dbg(key),
                                  nt_errstr(status)));
                        error = status;
                }
@@ -1923,8 +1923,7 @@ NTSTATUS smbXsrv_session_logoff(struct smbXsrv_session *session)
                        DEBUG(0, ("smbXsrv_session_logoff(0x%08x): "
                                  "failed to delete local key '%s': %s\n",
                                  session->global->session_global_id,
-                                 hex_encode_talloc(local_rec, key.dptr,
-                                                   key.dsize),
+                                 tdb_data_dbg(key),
                                  nt_errstr(status)));
                        error = status;
                }
@@ -2469,7 +2468,7 @@ static int smbXsrv_session_global_traverse_fn(struct db_record *rec, void *data)
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                DEBUG(1,("Invalid record in smbXsrv_session_global.tdb:"
                         "key '%s' ndr_pull_struct_blob - %s\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         ndr_errstr(ndr_err)));
                goto done;
        }
@@ -2477,7 +2476,7 @@ static int smbXsrv_session_global_traverse_fn(struct db_record *rec, void *data)
        if (global_blob.version != SMBXSRV_VERSION_0) {
                DEBUG(1,("Invalid record in smbXsrv_session_global.tdb:"
                         "key '%s' unsupported version - %d\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         (int)global_blob.version));
                goto done;
        }
@@ -2485,7 +2484,7 @@ static int smbXsrv_session_global_traverse_fn(struct db_record *rec, void *data)
        if (global_blob.info.info0 == NULL) {
                DEBUG(1,("Invalid record in smbXsrv_tcon_global.tdb:"
                         "key '%s' info0 NULL pointer\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize)));
+                        tdb_data_dbg(key)));
                goto done;
        }
 

diff --git a/source3/smbd/smbXsrv_tcon.c b/source3/smbd/smbXsrv_tcon.c
index 1ee1bbba4f39594ff16abf84d8c9c4bcfa7b7987..7d98b987a63810d7a49010d331de04c940098096 100644 (file)
--- a/source3/smbd/smbXsrv_tcon.c
+++ b/source3/smbd/smbXsrv_tcon.c
@@ -30,6 +30,7 @@
 #include "lib/util/util_tdb.h"
 #include "librpc/gen_ndr/ndr_smbXsrv.h"
 #include "serverid.h"
+#include "source3/include/util_tdb.h"
 
 struct smbXsrv_tcon_table {
        struct {
@@ -164,7 +165,7 @@ static struct db_record *smbXsrv_tcon_global_fetch_locked(
 
        if (rec == NULL) {
                DBG_DEBUG("Failed to lock global id 0x%08x, key '%s'\n", id,
-                         hex_encode_talloc(talloc_tos(), key.dptr, key.dsize));
+                         tdb_data_dbg(key));
        }
 
        return rec;
@@ -185,7 +186,7 @@ static struct db_record *smbXsrv_tcon_local_fetch_locked(
 
        if (rec == NULL) {
                DBG_DEBUG("Failed to lock local id 0x%08x, key '%s'\n", id,
-                         hex_encode_talloc(talloc_tos(), key.dptr, key.dsize));
+                         tdb_data_dbg(key));
        }
 
        return rec;
@@ -609,7 +610,7 @@ static void smbXsrv_tcon_global_verify_record(struct db_record *db_rec,
                NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
                DEBUG(1,("smbXsrv_tcon_global_verify_record: "
                         "key '%s' ndr_pull_struct_blob - %s\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         nt_errstr(status)));
                TALLOC_FREE(frame);
                return;
@@ -623,7 +624,7 @@ static void smbXsrv_tcon_global_verify_record(struct db_record *db_rec,
        if (global_blob.version != SMBXSRV_VERSION_0) {
                DEBUG(0,("smbXsrv_tcon_global_verify_record: "
                         "key '%s' use unsupported version %u\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         global_blob.version));
                NDR_PRINT_DEBUG(smbXsrv_tcon_globalB, &global_blob);
                TALLOC_FREE(frame);
@@ -637,7 +638,7 @@ static void smbXsrv_tcon_global_verify_record(struct db_record *db_rec,
                struct server_id_buf idbuf;
                DEBUG(2,("smbXsrv_tcon_global_verify_record: "
                         "key '%s' server_id %s does not exist.\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         server_id_str_buf(global->server_id, &idbuf)));
                if (DEBUGLVL(2)) {
                        NDR_PRINT_DEBUG(smbXsrv_tcon_globalB, &global_blob);
@@ -689,7 +690,7 @@ static NTSTATUS smbXsrv_tcon_global_store(struct smbXsrv_tcon_global0 *global)
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                status = ndr_map_error2ntstatus(ndr_err);
                DEBUG(1,("smbXsrv_tcon_global_store: key '%s' ndr_push - %s\n",
-                        hex_encode_talloc(global->db_rec, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         nt_errstr(status)));
                TALLOC_FREE(global->db_rec);
                return status;
@@ -699,7 +700,7 @@ static NTSTATUS smbXsrv_tcon_global_store(struct smbXsrv_tcon_global0 *global)
        status = dbwrap_record_store(global->db_rec, val, TDB_REPLACE);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(1,("smbXsrv_tcon_global_store: key '%s' store - %s\n",
-                        hex_encode_talloc(global->db_rec, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         nt_errstr(status)));
                TALLOC_FREE(global->db_rec);
                return status;
@@ -707,7 +708,7 @@ static NTSTATUS smbXsrv_tcon_global_store(struct smbXsrv_tcon_global0 *global)
 
        if (DEBUGLVL(10)) {
                DEBUG(10,("smbXsrv_tcon_global_store: key '%s' stored\n",
-                        hex_encode_talloc(global->db_rec, key.dptr, key.dsize)));
+                         tdb_data_dbg(key)));
                NDR_PRINT_DEBUG(smbXsrv_tcon_globalB, &global_blob);
        }
 
@@ -951,8 +952,7 @@ NTSTATUS smbXsrv_tcon_disconnect(struct smbXsrv_tcon *tcon, uint64_t vuid)
                                  "failed to delete global key '%s': %s\n",
                                  tcon->global->tcon_global_id,
                                  tcon->global->share_name,
-                                 hex_encode_talloc(global_rec, key.dptr,
-                                                   key.dsize),
+                                 tdb_data_dbg(key),
                                  nt_errstr(status)));
                        error = status;
                }
@@ -978,8 +978,7 @@ NTSTATUS smbXsrv_tcon_disconnect(struct smbXsrv_tcon *tcon, uint64_t vuid)
                                  "failed to delete local key '%s': %s\n",
                                  tcon->global->tcon_global_id,
                                  tcon->global->share_name,
-                                 hex_encode_talloc(local_rec, key.dptr,
-                                                   key.dsize),
+                                 tdb_data_dbg(key),
                                  nt_errstr(status)));
                        error = status;
                }
@@ -1203,7 +1202,7 @@ static int smbXsrv_tcon_global_traverse_fn(struct db_record *rec, void *data)
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                DEBUG(1,("Invalid record in smbXsrv_tcon_global.tdb:"
                         "key '%s' ndr_pull_struct_blob - %s\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         ndr_errstr(ndr_err)));
                goto done;
        }
@@ -1211,7 +1210,7 @@ static int smbXsrv_tcon_global_traverse_fn(struct db_record *rec, void *data)
        if (global_blob.version != SMBXSRV_VERSION_0) {
                DEBUG(1,("Invalid record in smbXsrv_tcon_global.tdb:"
                         "key '%s' unsupported version - %d\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize),
+                        tdb_data_dbg(key),
                         (int)global_blob.version));
                goto done;
        }
@@ -1219,7 +1218,7 @@ static int smbXsrv_tcon_global_traverse_fn(struct db_record *rec, void *data)
        if (global_blob.info.info0 == NULL) {
                DEBUG(1,("Invalid record in smbXsrv_tcon_global.tdb:"
                         "key '%s' info0 NULL pointer\n",
-                        hex_encode_talloc(frame, key.dptr, key.dsize)));
+                        tdb_data_dbg(key)));
                goto done;
        }