From e1d7cfb41b3b25ad1460570e998d0a6b38a4a1f0 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 30 Aug 2011 16:00:21 +0200
Subject: s3:registry: use the regdb_trans_do wrapper instead of using
 dbwrap_trans_do directly in the registry db code.

This verifies the regdb format version number before the corresponding write operations.
---
 source3/registry/reg_backend_db.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'source3/registry/reg_backend_db.c')

diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 821ed6b386..74808c4e17 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -262,9 +262,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);
 }
 
 /***********************************************************************
@@ -397,9 +397,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);
@@ -1201,9 +1201,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);
 
@@ -1290,9 +1290,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);
@@ -1332,9 +1332,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;
 }
@@ -1416,9 +1416,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);
-- 
cgit