sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3:registry: wrap reg_createkey() in a transaction

Browse Source 
This is wrong layering (calling into regdb_transaction* in the reg_api code)
but fixes a potential race. It makes the multi-step create procedure atomic.

This should completely be done in the backend.

Signed-off-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Michael Adam 2012-04-12 22:17:35 +02:00 committed by Andreas Schneider
parent 1af68be008
commit 32ac4f4b34
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source3/registry/reg_api.c
View File

@ -580,6 +580,13 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
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;
@ -589,7 +596,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) {
@ -610,14 +617,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;
}
/*
@ -628,7 +635,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;
}
/*
@ -636,10 +643,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
@ -650,6 +661,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;