s3:registry: use the regdb_trans_do wrapper instead of using dbwrap_trans_do directly...
authorMichael Adam <obnox@samba.org>
Tue, 30 Aug 2011 14:00:21 +0000 (16:00 +0200)
committerMichael Adam <obnox@samba.org>
Tue, 11 Oct 2011 13:21:15 +0000 (15:21 +0200)
This verifies the regdb format version number before the corresponding write operations.

source3/registry/reg_backend_db.c

index 3d6f74ecb78831f9d4fe597ccc1e37b0102fe566..bc6cb5812171fd98b700cf8dbc166db9d943ebb8 100644 (file)
@@ -260,9 +260,9 @@ WERROR init_registry_key(const char *add_path)
 
        init_ctx.add_path = add_path;
 
-       return ntstatus_to_werror(dbwrap_trans_do(regdb,
-                                                 init_registry_key_action,
-                                                 &init_ctx));
+       return regdb_trans_do(regdb,
+                             init_registry_key_action,
+                             &init_ctx);
 }
 
 /***********************************************************************
@@ -395,9 +395,9 @@ do_init:
         * transaction behaviour.
         */
 
-       werr = ntstatus_to_werror(dbwrap_trans_do(regdb,
-                                                 init_registry_data_action,
-                                                 NULL));
+       werr = regdb_trans_do(regdb,
+                             init_registry_data_action,
+                             NULL);
 
 done:
        TALLOC_FREE(frame);
@@ -1199,9 +1199,9 @@ static bool regdb_store_keys_internal(struct db_context *db, const char *key,
        store_ctx.key = key;
        store_ctx.ctr = ctr;
 
-       werr = ntstatus_to_werror(dbwrap_trans_do(db,
-                                                 regdb_store_keys_action,
-                                                 &store_ctx));
+       werr = regdb_trans_do(db,
+                             regdb_store_keys_action,
+                             &store_ctx);
 
        ret = W_ERROR_IS_OK(werr);
 
@@ -1288,9 +1288,9 @@ static WERROR regdb_create_subkey_internal(struct db_context *db,
        create_ctx.key = key;
        create_ctx.subkey = subkey;
 
-       werr = ntstatus_to_werror(dbwrap_trans_do(db,
-                                                 regdb_create_subkey_action,
-                                                 &create_ctx));
+       werr = regdb_trans_do(db,
+                             regdb_create_subkey_action,
+                             &create_ctx);
 
 done:
        talloc_free(mem_ctx);
@@ -1330,9 +1330,9 @@ static WERROR regdb_create_basekey(struct db_context *db, const char *key)
 
        create_ctx.key = key;
 
-       werr = ntstatus_to_werror(dbwrap_trans_do(db,
-                                                 regdb_create_basekey_action,
-                                                 &create_ctx));
+       werr = regdb_trans_do(db,
+                             regdb_create_basekey_action,
+                             &create_ctx);
 
        return werr;
 }
@@ -1414,9 +1414,9 @@ static WERROR regdb_delete_subkey(const char *key, const char *subkey, bool lazy
        delete_ctx.path = path;
        delete_ctx.lazy = lazy;
 
-       werr = ntstatus_to_werror(dbwrap_trans_do(regdb,
-                                                 regdb_delete_subkey_action,
-                                                 &delete_ctx));
+       werr = regdb_trans_do(regdb,
+                             regdb_delete_subkey_action,
+                             &delete_ctx);
 
 done:
        talloc_free(mem_ctx);