summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-07-07 23:03:46 +0200
committerMichael Adam <obnox@samba.org>2009-07-15 14:01:49 +0200
commit95ebf534d2bc9904cc7c02bccdf5c01cc595ad7c (patch)
tree87c59a7a2dd91709d0b3a4c5c3ea3fc3071fafe8 /source3
parenta00109e1e6c1063b560be85c43ef820d3446ae31 (diff)
downloadsamba-95ebf534d2bc9904cc7c02bccdf5c01cc595ad7c.tar.gz
samba-95ebf534d2bc9904cc7c02bccdf5c01cc595ad7c.tar.bz2
samba-95ebf534d2bc9904cc7c02bccdf5c01cc595ad7c.zip
s3:registry: add db_context argument to init_registry_key_internal()
Michael
Diffstat (limited to 'source3')
-rw-r--r--source3/registry/reg_backend_db.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 8806a93735..d19eac3ccd 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -98,7 +98,8 @@ static struct builtin_regkey_value builtin_registry_values[] = {
* Initialize a key in the registry:
* create each component key of the specified path.
*/
-static WERROR init_registry_key_internal(const char *add_path)
+static WERROR init_registry_key_internal(struct db_context *db,
+ const char *add_path)
{
WERROR werr;
TALLOC_CTX *frame = talloc_stackframe();
@@ -177,14 +178,14 @@ static WERROR init_registry_key_internal(const char *add_path)
goto fail;
}
- regdb_fetch_keys_internal(regdb, base, subkeys);
+ regdb_fetch_keys_internal(db, base, subkeys);
if (*subkeyname) {
werr = regsubkey_ctr_addkey(subkeys, subkeyname);
if (!W_ERROR_IS_OK(werr)) {
goto fail;
}
}
- if (!regdb_store_keys_internal(regdb, base, subkeys)) {
+ if (!regdb_store_keys_internal(db, base, subkeys)) {
werr = WERR_CAN_NOT_COMPLETE;
goto fail;
}
@@ -215,7 +216,7 @@ WERROR init_registry_key(const char *add_path)
return WERR_REG_IO_FAILURE;
}
- werr = init_registry_key_internal(add_path);
+ werr = init_registry_key_internal(regdb, add_path);
if (!W_ERROR_IS_OK(werr)) {
goto fail;
}
@@ -301,7 +302,8 @@ do_init:
if (regdb_key_exists(regdb, builtin_registry_paths[i])) {
continue;
}
- werr = init_registry_key_internal(builtin_registry_paths[i]);
+ werr = init_registry_key_internal(regdb,
+ builtin_registry_paths[i]);
if (!W_ERROR_IS_OK(werr)) {
goto fail;
}