Changeset 751 for trunk/server/source3/lib/dbwrap_util.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/lib/dbwrap_util.c (modified) (1 diff)

trunk/server/source3/lib/dbwrap_util.c

@@ -447 +447 @@
 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 == -1) ? 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;
+}
 
 NTSTATUS dbwrap_delete_bystring_upper(struct db_context *db, const char *key)