From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 14 Apr 2008 22:12:45 +0000 (+0200)
Subject: pdb_tdb: fix the upgrade code, db_traverse returns the number of records!
X-Git-Tag: samba-3.3.0pre1~2655
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=baaf571d540ace5119c528fd35bceab335bd6741;p=thirdparty%2Fsamba.git

pdb_tdb: fix the upgrade code, db_traverse returns the number of records!

metze
---

diff --git a/source/passdb/pdb_tdb.c b/source/passdb/pdb_tdb.c
index 068ddb3692c..9c8c7b85179 100644
--- a/source/passdb/pdb_tdb.c
+++ b/source/passdb/pdb_tdb.c
@@ -775,6 +775,7 @@ static int tdbsam_convert_one(struct db_record *rec, void *priv)
 static bool tdbsam_convert(struct db_context *db, int32 from)
 {
 	struct tdbsam_convert_state state;
+	int ret;
 
 	state.from = from;
 	state.success = true;
@@ -784,7 +785,8 @@ static bool tdbsam_convert(struct db_context *db, int32 from)
 		return false;
 	}
 
-	if (db->traverse(db, tdbsam_convert_one, &state) != 0) {
+	ret = db->traverse(db, tdbsam_convert_one, &state);
+	if (ret < 0) {
 		DEBUG(0, ("traverse failed\n"));
 		goto cancel;
 	}