[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-913-gccdebe9

[Stefan Metzmacher]

The branch, v3-2-test has been updated
       via  ccdebe97f85b76378e42d8cf08324228bd19cf32 (commit)
       via  baaf571d540ace5119c528fd35bceab335bd6741 (commit)
      from  9003881773de787a51ceadcdc2cb1e95f6979763 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit ccdebe97f85b76378e42d8cf08324228bd19cf32
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Apr 15 00:18:34 2008 +0200

    lib/sharesec.c: fix the upgrade code, db_traverse returns the number of records!
    
    metze

commit baaf571d540ace5119c528fd35bceab335bd6741
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Apr 15 00:12:45 2008 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 source/lib/sharesec.c   |    6 ++++--
 source/passdb/pdb_tdb.c |    4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/sharesec.c b/source/lib/sharesec.c
index 471363b..d894347 100644
--- a/source/lib/sharesec.c
+++ b/source/lib/sharesec.c
@@ -94,8 +94,10 @@ static bool share_info_db_init(void)
 	}
 
 	if (vers_id != SHARE_DATABASE_VERSION_V2) {
-		if (share_db->traverse(share_db, delete_fn, NULL) != 0) {
-			DEBUG(0, ("wipe_all failed\n"));
+		int ret;
+		ret = share_db->traverse(share_db, delete_fn, NULL);
+		if (ret < 0) {
+			DEBUG(0, ("traverse failed\n"));
 			goto cancel;
 		}
 		if (dbwrap_store_int32(share_db, vstring,
diff --git a/source/passdb/pdb_tdb.c b/source/passdb/pdb_tdb.c
index 068ddb3..9c8c7b8 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;
 	}


-- 
Samba Shared Repository