From 8f098a635f713652c4846d71e24c0a199c25b8b7 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Wed, 17 Aug 2011 09:51:12 +0200
Subject: s3:dbwrap: change the dbwrap_traverse() wrapper to return the count
 in an additional parameter

---
 source3/lib/dbwrap/dbwrap.c | 14 ++++++++++++--
 source3/lib/dbwrap/dbwrap.h |  3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'source3/lib/dbwrap')

diff --git a/source3/lib/dbwrap/dbwrap.c b/source3/lib/dbwrap/dbwrap.c
index f0d61a9a2f..614251c06f 100644
--- a/source3/lib/dbwrap/dbwrap.c
+++ b/source3/lib/dbwrap/dbwrap.c
@@ -111,8 +111,18 @@ NTSTATUS dbwrap_delete(struct db_context *db, TDB_DATA key)
 
 NTSTATUS dbwrap_traverse(struct db_context *db,
 			 int (*f)(struct db_record*, void*),
-			 void *private_data)
+			 void *private_data,
+			 int *count)
 {
 	int ret = db->traverse(db, f, private_data);
-	return (ret < 0) ? NT_STATUS_INTERNAL_DB_CORRUPTION : NT_STATUS_OK;
+
+	if (ret < 0) {
+		return NT_STATUS_INTERNAL_DB_CORRUPTION;
+	}
+
+	if (count != NULL) {
+		*count = ret;
+	}
+
+	return NT_STATUS_OK;
 }
diff --git a/source3/lib/dbwrap/dbwrap.h b/source3/lib/dbwrap/dbwrap.h
index bceba6c2d4..7dda1bae52 100644
--- a/source3/lib/dbwrap/dbwrap.h
+++ b/source3/lib/dbwrap/dbwrap.h
@@ -65,7 +65,8 @@ TDB_DATA dbwrap_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
 		      TDB_DATA key);
 NTSTATUS dbwrap_traverse(struct db_context *db,
 			 int (*f)(struct db_record*, void*),
-			 void *private_data);
+			 void *private_data,
+			 int *count);
 
 
 /* The following definitions come from lib/dbwrap_util.c  */
-- 
cgit