s3: Add a "lock_order" argument to db_open

[metze/samba/wip.git] / source3 / lib / dbwrap / dbwrap_private.h

diff --git a/source3/lib/dbwrap/dbwrap_private.h b/source3/lib/dbwrap/dbwrap_private.h
index e7bd480cbbab52a449858a2ecf940e04f7fdcc71..d0b32793684296b179a90aca1db3a00e33bd12cd 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_private.h
+++ b/source3/lib/dbwrap/dbwrap_private.h
@@ -23,6 +23,8 @@
 #ifndef __DBWRAP_PRIVATE_H__
 #define __DBWRAP_PRIVATE_H__
 
+#include "dbwrap/dbwrap_open.h"
+
 struct db_record {
        TDB_DATA key, value;
        NTSTATUS (*store)(struct db_record *rec, TDB_DATA data, int flag);
@@ -34,8 +36,6 @@ struct db_context {
        struct db_record *(*fetch_locked)(struct db_context *db,
                                          TALLOC_CTX *mem_ctx,
                                          TDB_DATA key);
-       NTSTATUS (*fetch)(struct db_context *db, TALLOC_CTX *mem_ctx,
-                         TDB_DATA key, TDB_DATA *data);
        int (*traverse)(struct db_context *db,
                        int (*f)(struct db_record *rec,
                                 void *private_data),
@@ -49,27 +49,15 @@ struct db_context {
        int (*transaction_start)(struct db_context *db);
        int (*transaction_commit)(struct db_context *db);
        int (*transaction_cancel)(struct db_context *db);
-       int (*parse_record)(struct db_context *db, TDB_DATA key,
-                           int (*parser)(TDB_DATA key, TDB_DATA data,
-                                         void *private_data),
-                           void *private_data);
+       NTSTATUS (*parse_record)(struct db_context *db, TDB_DATA key,
+                                void (*parser)(TDB_DATA key, TDB_DATA data,
+                                               void *private_data),
+                                void *private_data);
        int (*exists)(struct db_context *db,TDB_DATA key);
        int (*wipe)(struct db_context *db);
        void *private_data;
        bool persistent;
 };
 
-NTSTATUS dbwrap_fallback_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
-                              TDB_DATA key, TDB_DATA *data);
-
-
-int dbwrap_fallback_parse_record(struct db_context *db, TDB_DATA key,
-                                int (*parser)(TDB_DATA key,
-                                              TDB_DATA data,
-                                              void *private_data),
-                                void *private_data);
-
-int dbwrap_fallback_wipe(struct db_context *db);
-
 #endif /* __DBWRAP_PRIVATE_H__ */