tdb_fetch_compat: use instead of tdb_fetch.

This is a noop for tdb1.

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

4 files changed, 9 insertions, 9 deletions

diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 935bb03f34..45c134cf80 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -91,7 +91,7 @@ static NTSTATUS db_ctdb_ltdb_fetch(struct db_ctdb_ctx *db,
 	TDB_DATA rec;
 	NTSTATUS status;
 
-	rec = tdb_fetch(db->wtdb->tdb, key);
+	rec = tdb_fetch_compat(db->wtdb->tdb, key);
 	if (rec.dsize < sizeof(struct ctdb_ltdb_header)) {
 		status = NT_STATUS_NOT_FOUND;
 		if (data) {
@@ -539,7 +539,7 @@ static struct db_record *db_ctdb_fetch_locked_transaction(struct db_ctdb_ctx *ct
 		return result;
 	}
 
-	ctdb_data = tdb_fetch(ctx->wtdb->tdb, key);
+	ctdb_data = tdb_fetch_compat(ctx->wtdb->tdb, key);
 	if (ctdb_data.dptr == NULL) {
 		/* create the record */
 		result->value = tdb_null;
@@ -625,7 +625,7 @@ static NTSTATUS db_ctdb_transaction_store(struct db_ctdb_transaction_handle *h,
 	if (!pull_newest_from_marshall_buffer(h->m_write, key, &header,
 					      NULL, NULL)) {
 
-		rec = tdb_fetch(h->ctx->wtdb->tdb, key);
+		rec = tdb_fetch_compat(h->ctx->wtdb->tdb, key);
 
 		if (rec.dptr != NULL) {
 			memcpy(&header, rec.dptr,
@@ -1066,7 +1066,7 @@ again:
 	result->delete_rec = db_ctdb_delete;
 	talloc_set_destructor(result, db_ctdb_record_destr);
 
-	ctdb_data = tdb_fetch(ctx->wtdb->tdb, key);
+	ctdb_data = tdb_fetch_compat(ctx->wtdb->tdb, key);
 
 	/*
 	 * See if we have a valid record and we are the dmaster. If so, we can
@@ -1166,7 +1166,7 @@ static int db_ctdb_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
 	}
 
 	/* try a direct fetch */
-	ctdb_data = tdb_fetch(ctx->wtdb->tdb, key);
+	ctdb_data = tdb_fetch_compat(ctx->wtdb->tdb, key);
 
 	/*
 	 * See if we have a valid record and we are the dmaster. If so, we can
diff --git a/source3/lib/eventlog/eventlog.c b/source3/lib/eventlog/eventlog.c
index 556938fe1d..b719c6f7f8 100644
--- a/source3/lib/eventlog/eventlog.c
+++ b/source3/lib/eventlog/eventlog.c
@@ -203,7 +203,7 @@ static bool make_way_for_eventlogs( TDB_CONTEXT * the_tdb, int32_t needed,
 		/* read a record, add the amt to nbytes */
 		key.dsize = sizeof(int32_t);
 		key.dptr = (unsigned char *)&i;
-		ret = tdb_fetch( the_tdb, key );
+		ret = tdb_fetch_compat( the_tdb, key );
 		if ( ret.dsize == 0 ) {
 			DEBUG( 8,
 			       ( "Can't find a record for the key, record [%d]\n",
@@ -679,7 +679,7 @@ struct eventlog_Record_tdb *evlog_pull_record_tdb(TALLOC_CTX *mem_ctx,
 	key.dptr = (unsigned char *)&srecno;
 	key.dsize = sizeof(int32_t);
 
-	data = tdb_fetch(tdb, key);
+	data = tdb_fetch_compat(tdb, key);
 	if (data.dsize == 0) {
 		DEBUG(8,("evlog_pull_record_tdb: "
 			"Can't find a record for the key, record %d\n",
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index 8d4861a176..5e15472829 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -206,7 +206,7 @@ bool gencache_set_data_blob(const char *keystr, const DATA_BLOB *blob,
 	 */
 
 	last_stabilize = 0;
-	databuf = tdb_fetch(cache_notrans, last_stabilize_key());
+	databuf = tdb_fetch_compat(cache_notrans, last_stabilize_key());
 	if ((databuf.dptr != NULL)
 	    && (databuf.dptr[databuf.dsize-1] == '\0')) {
 		last_stabilize = atoi((char *)databuf.dptr);
diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c
index 09b8706262..d7f370c9e4 100644
--- a/source3/lib/messages_local.c
+++ b/source3/lib/messages_local.c
@@ -191,7 +191,7 @@ static NTSTATUS messaging_tdb_fetch(TDB_CONTEXT *msg_tdb,
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	data = tdb_fetch(msg_tdb, key);
+	data = tdb_fetch_compat(msg_tdb, key);
 
 	if (data.dptr == NULL) {
 		*presult = result;