tdb_compat: use tdb_errorstr_compat()

Since TDB2 functions return the error directly, tdb_errorstr() taken an
error code, not the tdb as it does in TDB1.

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

diff --git a/libcli/auth/schannel_state_tdb.c b/libcli/auth/schannel_state_tdb.c
index f95691fd5c0e0e5a297dd03c90e4c6bdeb1fa0c6..76110b89effa96acffcc25e21abaa32cb9f73e12 100644 (file)
--- a/libcli/auth/schannel_state_tdb.c
+++ b/libcli/auth/schannel_state_tdb.c
@@ -100,7 +100,7 @@ NTSTATUS schannel_store_session_key_tdb(struct tdb_wrap *tdb_sc,
        ret = tdb_store_bystring(tdb_sc->tdb, keystr, value, TDB_REPLACE);
        if (ret != TDB_SUCCESS) {
                DEBUG(0,("Unable to add %s to session key db - %s\n",
-                        keystr, tdb_errorstr(tdb_sc->tdb)));
+                        keystr, tdb_errorstr_compat(tdb_sc->tdb)));
                talloc_free(keystr);
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }

diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index d5ca164943d2b78381631c02ce461ceafe0830bc..296f50ebaead1565752f8d642b328dce2a0266b8 100644 (file)
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -472,7 +472,7 @@ bool gencache_stabilize(void)
                }
 
                DEBUG(10, ("Could not start transaction on gencache.tdb: "
-                          "%s\n", tdb_errorstr(cache)));
+                          "%s\n", tdb_errorstr_compat(cache)));
                return false;
        }
        res = tdb_transaction_start(cache_notrans);
@@ -480,7 +480,7 @@ bool gencache_stabilize(void)
                tdb_transaction_cancel(cache);
                DEBUG(10, ("Could not start transaction on "
                           "gencache_notrans.tdb: %s\n",
-                          tdb_errorstr(cache_notrans)));
+                          tdb_errorstr_compat(cache_notrans)));
                return false;
        }
 
@@ -503,7 +503,7 @@ bool gencache_stabilize(void)
        res = tdb_transaction_commit(cache);
        if (res != 0) {
                DEBUG(10, ("tdb_transaction_commit on gencache.tdb failed: "
-                          "%s\n", tdb_errorstr(cache)));
+                          "%s\n", tdb_errorstr_compat(cache)));
                tdb_transaction_cancel(cache_notrans);
                return false;
        }
@@ -511,7 +511,7 @@ bool gencache_stabilize(void)
        res = tdb_transaction_commit(cache_notrans);
        if (res != 0) {
                DEBUG(10, ("tdb_transaction_commit on gencache.tdb failed: "
-                          "%s\n", tdb_errorstr(cache)));
+                          "%s\n", tdb_errorstr_compat(cache)));
                return false;
        }
 
@@ -556,14 +556,14 @@ static int stabilize_fn(struct tdb_context *tdb, TDB_DATA key, TDB_DATA val,
 
        if (res != 0) {
                DEBUG(10, ("Transfer to gencache.tdb failed: %s\n",
-                          tdb_errorstr(cache)));
+                          tdb_errorstr_compat(cache)));
                state->error = true;
                return -1;
        }
 
        if (tdb_delete(cache_notrans, key) != 0) {
                DEBUG(10, ("tdb_delete from gencache_notrans.tdb failed: "
-                          "%s\n", tdb_errorstr(cache_notrans)));
+                          "%s\n", tdb_errorstr_compat(cache_notrans)));
                state->error = true;
                return -1;
        }

diff --git a/source3/printing/nt_printing_tdb.c b/source3/printing/nt_printing_tdb.c
index e703fee678fd1146b79d4cdc0c2e61f1a977b6e9..028dc0b1da9321844c1f4c34ad0fffa81bd1c0de 100644 (file)
--- a/source3/printing/nt_printing_tdb.c
+++ b/source3/printing/nt_printing_tdb.c
@@ -101,12 +101,12 @@ static bool upgrade_to_version_3(void)
                        DEBUG(0,("upgrade_to_version_3:moving form\n"));
                        if (tdb_store(tdb_forms, kbuf, dbuf, TDB_REPLACE) != 0) {
                                SAFE_FREE(dbuf.dptr);
-                               DEBUG(0,("upgrade_to_version_3: failed to move form. Error (%s).\n", tdb_errorstr(tdb_forms)));
+                               DEBUG(0,("upgrade_to_version_3: failed to move form. Error (%s).\n", tdb_errorstr_compat(tdb_forms)));
                                return False;
                        }
                        if (tdb_delete(tdb_drivers, kbuf) != 0) {
                                SAFE_FREE(dbuf.dptr);
-                               DEBUG(0,("upgrade_to_version_3: failed to delete form. Error (%s)\n", tdb_errorstr(tdb_drivers)));
+                               DEBUG(0,("upgrade_to_version_3: failed to delete form. Error (%s)\n", tdb_errorstr_compat(tdb_drivers)));
                                return False;
                        }
                }
@@ -115,12 +115,12 @@ static bool upgrade_to_version_3(void)
                        DEBUG(0,("upgrade_to_version_3:moving printer\n"));
                        if (tdb_store(tdb_printers, kbuf, dbuf, TDB_REPLACE) != 0) {
                                SAFE_FREE(dbuf.dptr);
-                               DEBUG(0,("upgrade_to_version_3: failed to move printer. Error (%s)\n", tdb_errorstr(tdb_printers)));
+                               DEBUG(0,("upgrade_to_version_3: failed to move printer. Error (%s)\n", tdb_errorstr_compat(tdb_printers)));
                                return False;
                        }
                        if (tdb_delete(tdb_drivers, kbuf) != 0) {
                                SAFE_FREE(dbuf.dptr);
-                               DEBUG(0,("upgrade_to_version_3: failed to delete printer. Error (%s)\n", tdb_errorstr(tdb_drivers)));
+                               DEBUG(0,("upgrade_to_version_3: failed to delete printer. Error (%s)\n", tdb_errorstr_compat(tdb_drivers)));
                                return False;
                        }
                }
@@ -129,12 +129,12 @@ static bool upgrade_to_version_3(void)
                        DEBUG(0,("upgrade_to_version_3:moving secdesc\n"));
                        if (tdb_store(tdb_printers, kbuf, dbuf, TDB_REPLACE) != 0) {
                                SAFE_FREE(dbuf.dptr);
-                               DEBUG(0,("upgrade_to_version_3: failed to move secdesc. Error (%s)\n", tdb_errorstr(tdb_printers)));
+                               DEBUG(0,("upgrade_to_version_3: failed to move secdesc. Error (%s)\n", tdb_errorstr_compat(tdb_printers)));
                                return False;
                        }
                        if (tdb_delete(tdb_drivers, kbuf) != 0) {
                                SAFE_FREE(dbuf.dptr);
-                               DEBUG(0,("upgrade_to_version_3: failed to delete secdesc. Error (%s)\n", tdb_errorstr(tdb_drivers)));
+                               DEBUG(0,("upgrade_to_version_3: failed to delete secdesc. Error (%s)\n", tdb_errorstr_compat(tdb_drivers)));
                                return False;
                        }
                }

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index b8028b1674b7ce2f93f0ffff2707bb1e72cd569b..50218d0132d5c4c034c72a395e0afec91a995570 100644 (file)
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -486,7 +486,7 @@ bool wcache_store_seqnum(const char *domain_name, uint32_t seqnum,
        TALLOC_FREE(key_str);
        if (ret == -1) {
                DEBUG(10, ("tdb_store_bystring failed: %s\n",
-                          tdb_errorstr(wcache->tdb)));
+                          tdb_errorstr_compat(wcache->tdb)));
                TALLOC_FREE(key_str);
                return false;
        }
@@ -3165,7 +3165,7 @@ bool initialize_winbindd_cache(void)
                /* Write the version. */
                if (!tdb_store_uint32(wcache->tdb, WINBINDD_CACHE_VERSION_KEYSTR, WINBINDD_CACHE_VERSION)) {
                        DEBUG(0,("initialize_winbindd_cache: version number store failed %s\n",
-                               tdb_errorstr(wcache->tdb) ));
+                               tdb_errorstr_compat(wcache->tdb) ));
                        return false;
                }
        }