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

registry: refactor creation of subkeys out of init_registry_data().

Browse Source 
Michael
(This used to be commit 55233f875e)
This commit is contained in:
Michael Adam 2008-03-20 13:59:09 +01:00
parent 12b9b5621a
commit 1f3139df25
1 changed files with 92 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
source3/registry/reg_backend_db.c
View File

@ -87,22 +87,106 @@ static struct builtin_regkey_value builtin_registry_values[] = {
{ NULL, NULL, 0, { NULL } }
};
/**
* Initialize a key in the registry:
* create each component key of the specified path.
*/
static bool init_registry_key_internal(const char *add_path)
{
bool ret = false;
TALLOC_CTX *frame = talloc_stackframe();
char *path = NULL;
char *base = NULL;
char *remaining = NULL;
char *keyname;
char *subkeyname;
REGSUBKEY_CTR *subkeys;
const char *p, *p2;
DEBUG(6, ("init_registry_key: Adding [%s]\n", add_path));
path = talloc_strdup(frame, add_path);
base = talloc_strdup(frame, "");
if (!path || !base) {
goto fail;
}
p = path;
while (next_token_talloc(frame, &p, &keyname, "\\")) {
/* build up the registry path from the components */
if (*base) {
base = talloc_asprintf(frame, "%s\\", base);
if (!base) {
goto fail;
}
}
base = talloc_asprintf_append(base, "%s", keyname);
if (!base) {
goto fail;
}
/* get the immediate subkeyname (if we have one ) */
subkeyname = talloc_strdup(frame, "");
if (!subkeyname) {
goto fail;
}
if (*p) {
remaining = talloc_strdup(frame, p);
if (!remaining) {
goto fail;
}
p2 = remaining;
if (!next_token_talloc(frame, &p2,
&subkeyname, "\\"))
{
subkeyname = talloc_strdup(frame,p2);
if (!subkeyname) {
goto fail;
}
}
}
DEBUG(10,("init_registry_key: Storing key [%s] with "
"subkey [%s]\n", base,
*subkeyname ? subkeyname : "NULL"));
/* we don't really care if the lookup succeeds or not
* since we are about to update the record.
* We just want any subkeys already present */
if (!(subkeys = TALLOC_ZERO_P(frame, REGSUBKEY_CTR))) {
DEBUG(0,("talloc() failure!\n"));
goto fail;
}
regdb_fetch_keys(base, subkeys);
if (*subkeyname) {
regsubkey_ctr_addkey( subkeys, subkeyname);
}
if (!regdb_store_keys( base, subkeys)) {
goto fail;
}
}
ret = true;
fail:
TALLOC_FREE(frame);
return ret;
}
/***********************************************************************
Open the registry data in the tdb
***********************************************************************/
static bool init_registry_data(void)
{
char *path = NULL;
char *base = NULL;
char *remaining = NULL;
TALLOC_CTX *frame = NULL;
char *keyname;
char *subkeyname;
REGSUBKEY_CTR *subkeys;
REGVAL_CTR *values;
int i;
const char *p, *p2;
UNISTR2 data;
/*
@ -122,80 +206,9 @@ static bool init_registry_data(void)
/* loop over all of the predefined paths and add each component */
for (i=0; builtin_registry_paths[i] != NULL; i++) {
frame = talloc_stackframe();
DEBUG(6, ("init_registry_data: Adding [%s]\n",
builtin_registry_paths[i]));
path = talloc_strdup(frame, builtin_registry_paths[i]);
base = talloc_strdup(frame, "");
if (!path || !base) {
if (!init_registry_key_internal(builtin_registry_paths[i])) {
goto fail;
}
p = path;
while (next_token_talloc(frame, &p, &keyname, "\\")) {
/* build up the registry path from the components */
if (*base) {
base = talloc_asprintf(frame, "%s\\", base);
if (!base) {
goto fail;
}
}
base = talloc_asprintf_append(base, "%s", keyname);
if (!base) {
goto fail;
}
/* get the immediate subkeyname (if we have one ) */
subkeyname = talloc_strdup(frame, "");
if (!subkeyname) {
goto fail;
}
if (*p) {
remaining = talloc_strdup(frame, p);
if (!remaining) {
goto fail;
}
p2 = remaining;
if (!next_token_talloc(frame, &p2,
&subkeyname, "\\"))
{
subkeyname = talloc_strdup(frame,p2);
if (!subkeyname) {
goto fail;
}
}
}
DEBUG(10,("init_registry_data: Storing key [%s] with "
"subkey [%s]\n", base,
*subkeyname ? subkeyname : "NULL"));
/* we don't really care if the lookup succeeds or not
* since we are about to update the record.
* We just want any subkeys already present */
if (!(subkeys = TALLOC_ZERO_P(frame, REGSUBKEY_CTR))) {
DEBUG(0,("talloc() failure!\n"));
goto fail;
}
regdb_fetch_keys(base, subkeys);
if (*subkeyname) {
regsubkey_ctr_addkey( subkeys, subkeyname);
}
if (!regdb_store_keys( base, subkeys)) {
goto fail;
}
}
TALLOC_FREE(frame);
}
/* loop over all of the predefined values and add each component */