From: Ralph Boehme <slow@samba.org>
Date: Mon, 10 Sep 2018 10:50:01 +0000 (+0200)
Subject: dbwrap_ctdb: return correct record count for a persistent db read-only traverse
X-Git-Tag: tdb-1.3.17~1632
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f84e372a5ba154c524c63a2da07410c036fd0222;p=thirdparty%2Fsamba.git

dbwrap_ctdb: return correct record count for a persistent db read-only traverse

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Sep 13 01:34:30 CEST 2018 on sn-devel-144
---

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index c6100e3fbaf..b487d10bddb 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -1768,7 +1768,15 @@ static int db_ctdb_traverse_read(struct db_context *db,
 	if (db->persistent) {
 		/* for persistent databases we don't need to do a ctdb traverse,
 		   we can do a faster local traverse */
-		return tdb_traverse_read(ctx->wtdb->tdb, traverse_persistent_callback_read, &state);
+		int nrecs;
+
+		nrecs = tdb_traverse_read(ctx->wtdb->tdb,
+					  traverse_persistent_callback_read,
+					  &state);
+		if (nrecs == -1) {
+			return -1;
+		}
+		return state.count;
 	}
 
 	ret = db_ctdbd_traverse(ctx->db_id, traverse_read_callback, &state);