summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/tdb_compat/tdb_compat.h1
-rw-r--r--source3/lib/gencache.c14
-rw-r--r--source3/printing/nt_printing_tdb.c12
-rw-r--r--source3/winbindd/winbindd_cache.c4
-rw-r--r--source4/dsdb/samdb/ldb_modules/schema_load.c2
5 files changed, 16 insertions, 17 deletions
diff --git a/lib/tdb_compat/tdb_compat.h b/lib/tdb_compat/tdb_compat.h
index cda86f741c0..2397de1342f 100644
--- a/lib/tdb_compat/tdb_compat.h
+++ b/lib/tdb_compat/tdb_compat.h
@@ -29,7 +29,6 @@
#include <ccan/typesafe_cb/typesafe_cb.h>
#include <tdb.h>
-#define tdb_errorstr_compat(tdb) tdb_errorstr(tdb)
#define tdb_fetch_compat tdb_fetch
#endif /* TDB_COMPAT_H */
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index d9cc08195d4..19fafe126d3 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -654,7 +654,7 @@ bool gencache_stabilize(void)
}
DEBUG(10, ("Could not start transaction on gencache.tdb: "
- "%s\n", tdb_errorstr_compat(cache->tdb)));
+ "%s\n", tdb_errorstr(cache->tdb)));
return false;
}
@@ -663,7 +663,7 @@ bool gencache_stabilize(void)
tdb_transaction_cancel(cache->tdb);
DEBUG(10, ("Could not get allrecord lock on "
"gencache_notrans.tdb: %s\n",
- tdb_errorstr_compat(cache_notrans->tdb)));
+ tdb_errorstr(cache_notrans->tdb)));
return false;
}
@@ -685,7 +685,7 @@ bool gencache_stabilize(void)
res = tdb_transaction_commit(cache->tdb);
if (res != 0) {
DEBUG(10, ("tdb_transaction_commit on gencache.tdb failed: "
- "%s\n", tdb_errorstr_compat(cache->tdb)));
+ "%s\n", tdb_errorstr(cache->tdb)));
tdb_unlockall(cache_notrans->tdb);
return false;
}
@@ -694,7 +694,7 @@ bool gencache_stabilize(void)
if (res < 0) {
DEBUG(10, ("tdb_traverse with wipe_fn on gencache_notrans.tdb "
"failed: %s\n",
- tdb_errorstr_compat(cache_notrans->tdb)));
+ tdb_errorstr(cache_notrans->tdb)));
tdb_unlockall(cache_notrans->tdb);
return false;
}
@@ -702,7 +702,7 @@ bool gencache_stabilize(void)
res = tdb_unlockall(cache_notrans->tdb);
if (res != 0) {
DEBUG(10, ("tdb_unlockall on gencache.tdb failed: "
- "%s\n", tdb_errorstr_compat(cache->tdb)));
+ "%s\n", tdb_errorstr(cache->tdb)));
return false;
}
@@ -747,7 +747,7 @@ 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_compat(cache->tdb)));
+ tdb_errorstr(cache->tdb)));
return -1;
}
@@ -775,7 +775,7 @@ static int wipe_fn(struct tdb_context *tdb, TDB_DATA key, TDB_DATA val,
res = tdb_delete(tdb, key);
if (res != 0) {
DEBUG(10, ("tdb_delete from gencache_notrans.tdb failed: "
- "%s\n", tdb_errorstr_compat(cache_notrans->tdb)));
+ "%s\n", tdb_errorstr(cache_notrans->tdb)));
return -1;
}
diff --git a/source3/printing/nt_printing_tdb.c b/source3/printing/nt_printing_tdb.c
index f798b955e45..f043575bce9 100644
--- 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_compat(tdb_forms)));
+ DEBUG(0,("upgrade_to_version_3: failed to move form. Error (%s).\n", tdb_errorstr(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_compat(tdb_drivers)));
+ DEBUG(0,("upgrade_to_version_3: failed to delete form. Error (%s)\n", tdb_errorstr(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_compat(tdb_printers)));
+ DEBUG(0,("upgrade_to_version_3: failed to move printer. Error (%s)\n", tdb_errorstr(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_compat(tdb_drivers)));
+ DEBUG(0,("upgrade_to_version_3: failed to delete printer. Error (%s)\n", tdb_errorstr(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_compat(tdb_printers)));
+ DEBUG(0,("upgrade_to_version_3: failed to move secdesc. Error (%s)\n", tdb_errorstr(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_compat(tdb_drivers)));
+ DEBUG(0,("upgrade_to_version_3: failed to delete secdesc. Error (%s)\n", tdb_errorstr(tdb_drivers)));
return False;
}
}
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 443fd81ece8..2200e5a923e 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -490,7 +490,7 @@ bool wcache_store_seqnum(const char *domain_name, uint32_t seqnum,
TALLOC_FREE(key_str);
if (ret != 0) {
DEBUG(10, ("tdb_store_bystring failed: %s\n",
- tdb_errorstr_compat(wcache->tdb)));
+ tdb_errorstr(wcache->tdb)));
TALLOC_FREE(key_str);
return false;
}
@@ -3268,7 +3268,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_compat(wcache->tdb) ));
+ tdb_errorstr(wcache->tdb) ));
return false;
}
}
diff --git a/source4/dsdb/samdb/ldb_modules/schema_load.c b/source4/dsdb/samdb/ldb_modules/schema_load.c
index 4538e89d59c..5ae6e3c0576 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_load.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_load.c
@@ -139,7 +139,7 @@ static int schema_metadata_get_uint64(struct ldb_module *module,
} else {
talloc_free(tmp_ctx);
return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
- tdb_errorstr_compat(tdb));
+ tdb_errorstr(tdb));
}
}
View Lorry Controller Status