s3:registry: introduce REG_DBWRAP_FLAGS to use for all db_open calls

This is in accordance with the use of REG_TDB_FLAGS.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index fdaf576e7bcc6273d22743b9451c82a1d97ddbd5..7c1e546dbc40c2b5179ad1dfa132336224a7daa3 100644 (file)
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -732,11 +732,11 @@ WERROR regdb_init(void)
 
        regdb = db_open(NULL, state_path("registry.tdb"), 0,
                        REG_TDB_FLAGS, O_RDWR, 0600,
-                       DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE);
+                       DBWRAP_LOCK_ORDER_1, REG_DBWRAP_FLAGS);
        if (!regdb) {
                regdb = db_open(NULL, state_path("registry.tdb"), 0,
                                REG_TDB_FLAGS, O_RDWR|O_CREAT, 0600,
-                               DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE);
+                               DBWRAP_LOCK_ORDER_1, REG_DBWRAP_FLAGS);
                if (!regdb) {
                        werr = ntstatus_to_werror(map_nt_error_from_unix(errno));
                        DEBUG(1,("regdb_init: Failed to open registry %s (%s)\n",
@@ -852,7 +852,7 @@ WERROR regdb_open( void )
 
        regdb = db_open(NULL, state_path("registry.tdb"), 0,
                        REG_TDB_FLAGS, O_RDWR, 0600,
-                       DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE);
+                       DBWRAP_LOCK_ORDER_1, REG_DBWRAP_FLAGS);
        if ( !regdb ) {
                result = ntstatus_to_werror( map_nt_error_from_unix( errno ) );
                DEBUG(0,("regdb_open: Failed to open %s! (%s)\n",

diff --git a/source3/registry/reg_db.h b/source3/registry/reg_db.h
index d0d9fd393178a24f9e5ddbf82a5bc6b129b03f06..f2f79d24eedf025448f6b45231f45b9bd5bc4a2a 100644 (file)
--- a/source3/registry/reg_db.h
+++ b/source3/registry/reg_db.h
@@ -21,6 +21,7 @@
 #define _REG_DB_H
 
 #define REG_TDB_FLAGS   TDB_SEQNUM
+#define REG_DBWRAP_FLAGS DBWRAP_FLAG_NONE
 
 #define REGDB_VERSION_V1    1  /* first db version with write support */
 #define REGDB_VERSION_V2    2  /* version 2 with normalized keys */