s3:registry: wrap reg_createkey() in a transaction

[ddiss/samba.git] / source3 / registry / reg_api.c

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index bd3cabb86e5f803013e9bda76c38aab3e3bd29b8..c7777a120f3a7e89be0624feedeeeb9f00f2808b 100644 (file)
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -568,13 +568,24 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
        char *path, *end;
        WERROR err;
 
-       if (!(mem_ctx = talloc_new(ctx))) return WERR_NOMEM;
+       mem_ctx = talloc_new(ctx);
+       if (mem_ctx == NULL) {
+               return WERR_NOMEM;
+       }
 
-       if (!(path = talloc_strdup(mem_ctx, subkeypath))) {
+       path = talloc_strdup(mem_ctx, subkeypath);
+       if (path == NULL) {
                err = WERR_NOMEM;
                goto done;
        }
 
+       err = regdb_transaction_start();
+       if (!W_ERROR_IS_OK(err)) {
+               DEBUG(0, ("reg_createkey: failed to start transaction: %s\n",
+                         win_errstr(err)));
+               goto done;
+       }
+
        while ((end = strchr(path, '\\')) != NULL) {
                struct registry_key *tmp;
                enum winreg_CreateAction action;
@@ -584,7 +595,7 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
                err = reg_createkey(mem_ctx, key, path,
                                    KEY_ENUMERATE_SUB_KEYS, &tmp, &action);
                if (!W_ERROR_IS_OK(err)) {
-                       goto done;
+                       goto trans_done;
                }
 
                if (key != parent) {
@@ -605,14 +616,14 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
                if (paction != NULL) {
                        *paction = REG_OPENED_EXISTING_KEY;
                }
-               goto done;
+               goto trans_done;
        }
 
        if (!W_ERROR_EQUAL(err, WERR_BADFILE)) {
                /*
                 * Something but "notfound" has happened, so bail out
                 */
-               goto done;
+               goto trans_done;
        }
 
        /*
@@ -623,7 +634,7 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
        err = reg_openkey(mem_ctx, key, "", KEY_CREATE_SUB_KEY,
                          &create_parent);
        if (!W_ERROR_IS_OK(err)) {
-               goto done;
+               goto trans_done;
        }
 
        /*
@@ -631,10 +642,14 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
         */
 
        err = fill_subkey_cache(create_parent);
-       if (!W_ERROR_IS_OK(err)) goto done;
+       if (!W_ERROR_IS_OK(err)) {
+               goto trans_done;
+       }
 
        err = create_reg_subkey(key->key, path);
-       W_ERROR_NOT_OK_GOTO_DONE(err);
+       if (!W_ERROR_IS_OK(err)) {
+               goto trans_done;
+       }
 
        /*
         * Now open the newly created key
@@ -645,6 +660,19 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
                *paction = REG_CREATED_NEW_KEY;
        }
 
+trans_done:
+       if (W_ERROR_IS_OK(err)) {
+               err = regdb_transaction_commit();
+               if (!W_ERROR_IS_OK(err)) {
+                       DEBUG(0, ("reg_createkey: Error committing transaction: %s\n", win_errstr(err)));
+               }
+       } else {
+               WERROR err1 = regdb_transaction_cancel();
+               if (!W_ERROR_IS_OK(err1)) {
+                       DEBUG(0, ("reg_createkey: Error cancelling transaction: %s\n", win_errstr(err1)));
+               }
+       }
+
  done:
        TALLOC_FREE(mem_ctx);
        return err;
@@ -790,23 +818,50 @@ WERROR reg_deletevalue(struct registry_key *key, const char *name)
                return WERR_ACCESS_DENIED;
        }
 
-       if (!W_ERROR_IS_OK(err = fill_value_cache(key))) {
+       err = regdb_transaction_start();
+       if (!W_ERROR_IS_OK(err)) {
+               DEBUG(0, ("reg_deletevalue: Failed to start transaction: %s\n",
+                         win_errstr(err)));
                return err;
        }
 
+       err = fill_value_cache(key);
+       if (!W_ERROR_IS_OK(err)) {
+               DEBUG(0, ("reg_deletevalue; Error filling value cache: %s\n",
+                         win_errstr(err)));
+               goto done;
+       }
+
        err = reg_value_exists(key, name);
        if (!W_ERROR_IS_OK(err)) {
-               return err;
+               goto done;
        }
 
        regval_ctr_delvalue(key->values, name);
 
        if (!store_reg_values(key->key, key->values)) {
                TALLOC_FREE(key->values);
-               return WERR_REG_IO_FAILURE;
+               err = WERR_REG_IO_FAILURE;
+               DEBUG(0, ("reg_deletevalue: store_reg_values failed\n"));
+               goto done;
        }
 
-       return WERR_OK;
+       err = WERR_OK;
+
+done:
+       if (W_ERROR_IS_OK(err)) {
+               err = regdb_transaction_commit();
+               if (!W_ERROR_IS_OK(err)) {
+                       DEBUG(0, ("reg_deletevalue: Error committing transaction: %s\n", win_errstr(err)));
+               }
+       } else {
+               WERROR err1 = regdb_transaction_cancel();
+               if (!W_ERROR_IS_OK(err1)) {
+                       DEBUG(0, ("reg_deletevalue: Error cancelling transaction: %s\n", win_errstr(err1)));
+               }
+       }
+
+       return err;
 }
 
 WERROR reg_getkeysecurity(TALLOC_CTX *mem_ctx, struct registry_key *key,