#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
-static struct tdb_wrap *tdb_reg = NULL;
-static int tdb_refcount;
+static struct db_context *regdb = NULL;
+static int regdb_refcount;
+
+static bool regdb_key_exists(const char *key);
+static bool regdb_key_is_base_key(const char *key);
/* List the deepest path into the registry. All part components will be created.*/
KEY_SMBCONF,
KEY_PERFLIB,
KEY_PERFLIB_009,
+ KEY_GROUP_POLICY,
+ KEY_SAMBA_GROUP_POLICY,
+ KEY_GP_MACHINE_POLICY,
+ KEY_GP_MACHINE_WIN_POLICY,
+ KEY_HKCU,
+ KEY_GP_USER_POLICY,
+ KEY_GP_USER_WIN_POLICY,
+ KEY_WINLOGON_GPEXT_PATH,
"HKLM\\SYSTEM\\CurrentControlSet\\Control\\Print\\Monitors",
KEY_PROD_OPTIONS,
"HKLM\\SYSTEM\\CurrentControlSet\\Control\\Terminal Server\\DefaultUserConfiguration",
{ NULL, NULL, 0, { NULL } }
};
-/***********************************************************************
- Open the registry data in the tdb
- ***********************************************************************/
-
-static bool init_registry_data( void )
+/**
+ * Initialize a key in the registry:
+ * create each component key of the specified path.
+ */
+static WERROR init_registry_key_internal(const char *add_path)
{
+ WERROR werr;
+ TALLOC_CTX *frame = talloc_stackframe();
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;
- /*
- * There are potentially quite a few store operations which are all
- * indiviually wrapped in tdb transactions. Wrapping them in a single
- * transaction gives just a single transaction_commit() to actually do
- * its fsync()s. See tdb/common/transaction.c for info about nested
- * transaction behaviour.
- */
+ DEBUG(6, ("init_registry_key: Adding [%s]\n", add_path));
- if ( tdb_transaction_start( tdb_reg->tdb ) == -1 ) {
- DEBUG(0, ("init_registry_data: tdb_transaction_start "
- "failed\n"));
- return false;
+ path = talloc_strdup(frame, add_path);
+ base = talloc_strdup(frame, "");
+ if (!path || !base) {
+ werr = WERR_NOMEM;
+ goto fail;
}
+ p = path;
- /* loop over all of the predefined paths and add each component */
+ while (next_token_talloc(frame, &p, &keyname, "\\")) {
- for ( i=0; builtin_registry_paths[i] != NULL; i++ ) {
+ /* build up the registry path from the components */
- frame = talloc_stackframe();
-
- DEBUG(6,("init_registry_data: Adding [%s]\n", builtin_registry_paths[i]));
-
- path = talloc_strdup(talloc_tos(), builtin_registry_paths[i]);
- base = talloc_strdup(talloc_tos(), "");
- if (!path || !base) {
- goto fail;
- }
- p = path;
-
- while (next_token_talloc(talloc_tos(), &p, &keyname, "\\")) {
-
- /* build up the registry path from the components */
-
- if (*base) {
- base = talloc_asprintf(talloc_tos(), "%s\\", base);
- if (!base) {
- goto fail;
- }
- }
- base = talloc_asprintf_append(base, "%s", keyname);
+ if (*base) {
+ base = talloc_asprintf(frame, "%s\\", base);
if (!base) {
+ werr = WERR_NOMEM;
goto fail;
}
+ }
+ base = talloc_asprintf_append(base, "%s", keyname);
+ if (!base) {
+ werr = WERR_NOMEM;
+ goto fail;
+ }
- /* get the immediate subkeyname (if we have one ) */
+ /* get the immediate subkeyname (if we have one ) */
- subkeyname = talloc_strdup(talloc_tos(), "");
- if (!subkeyname) {
+ subkeyname = talloc_strdup(frame, "");
+ if (!subkeyname) {
+ werr = WERR_NOMEM;
+ goto fail;
+ }
+ if (*p) {
+ remaining = talloc_strdup(frame, p);
+ if (!remaining) {
+ werr = WERR_NOMEM;
goto fail;
}
- if (*p) {
- remaining = talloc_strdup(talloc_tos(), p);
- if (!remaining) {
+ p2 = remaining;
+
+ if (!next_token_talloc(frame, &p2,
+ &subkeyname, "\\"))
+ {
+ subkeyname = talloc_strdup(frame,p2);
+ if (!subkeyname) {
+ werr = WERR_NOMEM;
goto fail;
}
- p2 = remaining;
-
- if (!next_token_talloc(talloc_tos(), &p2,
- &subkeyname, "\\")) {
- subkeyname = talloc_strdup(talloc_tos(),p2);
- if (!subkeyname) {
- goto fail;
- }
- }
}
+ }
- DEBUG(10,("init_registry_data: Storing key [%s] with subkey [%s]\n",
- base, *subkeyname ? subkeyname : "NULL"));
+ 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 */
+ /* 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(talloc_tos(), REGSUBKEY_CTR )) ) {
- DEBUG(0,("talloc() failure!\n"));
- goto fail;
- }
+ if (!(subkeys = TALLOC_ZERO_P(frame, REGSUBKEY_CTR))) {
+ DEBUG(0,("talloc() failure!\n"));
+ werr = WERR_NOMEM;
+ goto fail;
+ }
- regdb_fetch_keys(base, subkeys);
- if (*subkeyname) {
- regsubkey_ctr_addkey( subkeys, subkeyname);
- }
- if (!regdb_store_keys( base, subkeys)) {
+ regdb_fetch_keys(base, subkeys);
+ if (*subkeyname) {
+ werr = regsubkey_ctr_addkey(subkeys, subkeyname);
+ if (!W_ERROR_IS_OK(werr)) {
goto fail;
}
}
+ if (!regdb_store_keys( base, subkeys)) {
+ werr = WERR_CAN_NOT_COMPLETE;
+ goto fail;
+ }
+ }
+
+ werr = WERR_OK;
+
+fail:
+ TALLOC_FREE(frame);
+ return werr;
+}
+
+/**
+ * Initialize a key in the registry:
+ * create each component key of the specified path,
+ * wrapped in one db transaction.
+ */
+WERROR init_registry_key(const char *add_path)
+{
+ WERROR werr;
+
+ if (regdb_key_exists(add_path)) {
+ return WERR_OK;
+ }
+
+ if (regdb->transaction_start(regdb) != 0) {
+ DEBUG(0, ("init_registry_key: transaction_start failed\n"));
+ return WERR_REG_IO_FAILURE;
+ }
+
+ werr = init_registry_key_internal(add_path);
+ if (!W_ERROR_IS_OK(werr)) {
+ goto fail;
+ }
+
+ if (regdb->transaction_commit(regdb) != 0) {
+ DEBUG(0, ("init_registry_key: Could not commit transaction\n"));
+ return WERR_REG_IO_FAILURE;
+ }
+
+ return WERR_OK;
+
+fail:
+ if (regdb->transaction_cancel(regdb) != 0) {
+ smb_panic("init_registry_key: transaction_cancel failed\n");
+ }
+
+ return werr;
+}
+
+/***********************************************************************
+ Open the registry data in the tdb
+ ***********************************************************************/
+
+WERROR init_registry_data(void)
+{
+ WERROR werr;
+ TALLOC_CTX *frame = talloc_stackframe();
+ REGVAL_CTR *values;
+ int i;
+ UNISTR2 data;
+
+ /*
+ * First, check for the existence of the needed keys and values.
+ * If all do already exist, we can save the writes.
+ */
+ for (i=0; builtin_registry_paths[i] != NULL; i++) {
+ if (!regdb_key_exists(builtin_registry_paths[i])) {
+ goto do_init;
+ }
+ }
+
+ for (i=0; builtin_registry_values[i].path != NULL; i++) {
+ values = TALLOC_ZERO_P(frame, REGVAL_CTR);
+ if (values == NULL) {
+ werr = WERR_NOMEM;
+ goto done;
+ }
+
+ regdb_fetch_values(builtin_registry_values[i].path, values);
+ if (!regval_ctr_key_exists(values,
+ builtin_registry_values[i].valuename))
+ {
+ TALLOC_FREE(values);
+ goto do_init;
+ }
+
+ TALLOC_FREE(values);
+ }
+
+ werr = WERR_OK;
+ goto done;
+
+do_init:
+
+ /*
+ * There are potentially quite a few store operations which are all
+ * indiviually wrapped in tdb transactions. Wrapping them in a single
+ * transaction gives just a single transaction_commit() to actually do
+ * its fsync()s. See tdb/common/transaction.c for info about nested
+ * transaction behaviour.
+ */
- TALLOC_FREE(frame);
+ if (regdb->transaction_start(regdb) != 0) {
+ DEBUG(0, ("init_registry_data: tdb_transaction_start "
+ "failed\n"));
+ werr = WERR_REG_IO_FAILURE;
+ goto done;
+ }
+
+ /* loop over all of the predefined paths and add each component */
+
+ for (i=0; builtin_registry_paths[i] != NULL; i++) {
+ if (regdb_key_exists(builtin_registry_paths[i])) {
+ continue;
+ }
+ werr = init_registry_key_internal(builtin_registry_paths[i]);
+ if (!W_ERROR_IS_OK(werr)) {
+ goto fail;
+ }
}
/* loop over all of the predefined values and add each component */
for (i=0; builtin_registry_values[i].path != NULL; i++) {
- if (!(values = TALLOC_ZERO_P(talloc_tos(), REGVAL_CTR))) {
+ values = TALLOC_ZERO_P(frame, REGVAL_CTR);
+ if (values == NULL) {
+ werr = WERR_NOMEM;
goto fail;
}
- regdb_fetch_values( builtin_registry_values[i].path, values);
+ regdb_fetch_values(builtin_registry_values[i].path, values);
- /* preserve existing values across restarts. Only add new ones */
+ /* preserve existing values across restarts. Only add new ones */
- if (!regval_ctr_key_exists(values, builtin_registry_values[i].valuename)) {
+ if (!regval_ctr_key_exists(values,
+ builtin_registry_values[i].valuename))
+ {
switch(builtin_registry_values[i].type) {
case REG_DWORD:
- regval_ctr_addvalue( values,
- builtin_registry_values[i].valuename,
- REG_DWORD,
- (char*)&builtin_registry_values[i].data.dw_value,
- sizeof(uint32) );
+ regval_ctr_addvalue(values,
+ builtin_registry_values[i].valuename,
+ REG_DWORD,
+ (char*)&builtin_registry_values[i].data.dw_value,
+ sizeof(uint32));
break;
case REG_SZ:
- init_unistr2( &data, builtin_registry_values[i].data.string, UNI_STR_TERMINATE);
- regval_ctr_addvalue( values,
- builtin_registry_values[i].valuename,
- REG_SZ,
- (char*)data.buffer,
- data.uni_str_len*sizeof(uint16) );
+ init_unistr2(&data,
+ builtin_registry_values[i].data.string,
+ UNI_STR_TERMINATE);
+ regval_ctr_addvalue(values,
+ builtin_registry_values[i].valuename,
+ REG_SZ,
+ (char*)data.buffer,
+ data.uni_str_len*sizeof(uint16));
break;
default:
- DEBUG(0,("init_registry_data: invalid value type in builtin_registry_values [%d]\n",
- builtin_registry_values[i].type));
+ DEBUG(0, ("init_registry_data: invalid value "
+ "type in builtin_registry_values "
+ "[%d]\n",
+ builtin_registry_values[i].type));
}
- regdb_store_values( builtin_registry_values[i].path, values );
+ regdb_store_values(builtin_registry_values[i].path,
+ values);
}
- TALLOC_FREE( values );
+ TALLOC_FREE(values);
}
- TALLOC_FREE(frame);
-
- if (tdb_transaction_commit( tdb_reg->tdb ) == -1) {
+ if (regdb->transaction_commit(regdb) != 0) {
DEBUG(0, ("init_registry_data: Could not commit "
"transaction\n"));
- return false;
+ werr = WERR_REG_IO_FAILURE;
+ } else {
+ werr = WERR_OK;
}
- return true;
+ goto done;
- fail:
-
- TALLOC_FREE(frame);
-
- if (tdb_transaction_cancel( tdb_reg->tdb ) == -1) {
+fail:
+ if (regdb->transaction_cancel(regdb) != 0) {
smb_panic("init_registry_data: tdb_transaction_cancel "
"failed\n");
}
- return false;
+done:
+ TALLOC_FREE(frame);
+ return werr;
}
/***********************************************************************
Open the registry database
***********************************************************************/
-bool regdb_init( void )
+WERROR regdb_init(void)
{
const char *vstring = "INFO/version";
uint32 vers_id;
+ WERROR werr;
- if ( tdb_reg ) {
- DEBUG(10,("regdb_init: incrementing refcount (%d)\n", tdb_refcount));
- tdb_refcount++;
- return true;
+ if (regdb) {
+ DEBUG(10, ("regdb_init: incrementing refcount (%d)\n",
+ regdb_refcount));
+ regdb_refcount++;
+ return WERR_OK;
}
- if ( !(tdb_reg = tdb_wrap_open(NULL, state_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR, 0600)) )
- {
- tdb_reg = tdb_wrap_open(NULL, state_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR|O_CREAT, 0600);
- if ( !tdb_reg ) {
- DEBUG(0,("regdb_init: Failed to open registry %s (%s)\n",
+ regdb = db_open(NULL, state_path("registry.tdb"), 0,
+ REG_TDB_FLAGS, O_RDWR, 0600);
+ if (!regdb) {
+ regdb = db_open(NULL, state_path("registry.tdb"), 0,
+ REG_TDB_FLAGS, O_RDWR|O_CREAT, 0600);
+ if (!regdb) {
+ werr = ntstatus_to_werror(map_nt_error_from_unix(errno));
+ DEBUG(1,("regdb_init: Failed to open registry %s (%s)\n",
state_path("registry.tdb"), strerror(errno) ));
- return false;
+ return werr;
}
DEBUG(10,("regdb_init: Successfully created registry tdb\n"));
}
- tdb_refcount = 1;
+ regdb_refcount = 1;
- vers_id = tdb_fetch_int32(tdb_reg->tdb, vstring);
+ vers_id = dbwrap_fetch_int32(regdb, vstring);
if ( vers_id != REGVER_V1 ) {
+ NTSTATUS status;
/* any upgrade code here if needed */
- DEBUG(10, ("regdb_init: got INFO/version = %d != %d\n",
+ DEBUG(10, ("regdb_init: got %s = %d != %d\n", vstring,
vers_id, REGVER_V1));
+ status = dbwrap_trans_store_int32(regdb, vstring, REGVER_V1);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("regdb_init: error storing %s = %d: %s\n",
+ vstring, REGVER_V1, nt_errstr(status)));
+ return ntstatus_to_werror(status);
+ } else {
+ DEBUG(10, ("regdb_init: stored %s = %d\n",
+ vstring, REGVER_V1));
+ }
}
- /* always setup the necessary keys and values */
-
- if ( !init_registry_data() ) {
- DEBUG(0,("regdb_init: Failed to initialize data in registry!\n"));
- return false;
- }
-
- return true;
+ return WERR_OK;
}
/***********************************************************************
{
WERROR result = WERR_OK;
- if ( tdb_reg ) {
- DEBUG(10,("regdb_open: incrementing refcount (%d)\n", tdb_refcount));
- tdb_refcount++;
+ if ( regdb ) {
+ DEBUG(10,("regdb_open: incrementing refcount (%d)\n", regdb_refcount));
+ regdb_refcount++;
return WERR_OK;
}
become_root();
- tdb_reg = tdb_wrap_open(NULL, state_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR, 0600);
- if ( !tdb_reg ) {
+ regdb = db_open(NULL, state_path("registry.tdb"), 0,
+ REG_TDB_FLAGS, O_RDWR, 0600);
+ if ( !regdb ) {
result = ntstatus_to_werror( map_nt_error_from_unix( errno ) );
DEBUG(0,("regdb_open: Failed to open %s! (%s)\n",
state_path("registry.tdb"), strerror(errno) ));
unbecome_root();
- tdb_refcount = 1;
- DEBUG(10,("regdb_open: refcount reset (%d)\n", tdb_refcount));
+ regdb_refcount = 1;
+ DEBUG(10,("regdb_open: refcount reset (%d)\n", regdb_refcount));
return result;
}
int regdb_close( void )
{
- if (tdb_refcount == 0) {
+ if (regdb_refcount == 0) {
return 0;
}
- tdb_refcount--;
+ regdb_refcount--;
- DEBUG(10,("regdb_close: decrementing refcount (%d)\n", tdb_refcount));
+ DEBUG(10,("regdb_close: decrementing refcount (%d)\n", regdb_refcount));
- if ( tdb_refcount > 0 )
+ if ( regdb_refcount > 0 )
return 0;
- SMB_ASSERT( tdb_refcount >= 0 );
+ SMB_ASSERT( regdb_refcount >= 0 );
- TALLOC_FREE(tdb_reg);
+ TALLOC_FREE(regdb);
return 0;
}
***********************************************************************/
int regdb_get_seqnum(void)
{
- return tdb_get_seqnum(tdb_reg->tdb);
+ return regdb->get_seqnum(regdb);
}
/***********************************************************************
bool ret = true;
uint32 num_subkeys = regsubkey_ctr_numkeys(ctr);
char *keyname = NULL;
- TALLOC_CTX *ctx = talloc_tos();
+ TALLOC_CTX *ctx = talloc_stackframe();
+ NTSTATUS status;
if (!key) {
return false;
/* allocate some initial memory */
- if (!(buffer = (uint8 *)SMB_MALLOC(1024))) {
+ buffer = (uint8 *)SMB_MALLOC(1024);
+ if (buffer == NULL) {
return false;
}
buflen = 1024;
/* store the number of subkeys */
- len += tdb_pack(buffer+len, buflen-len, "d", num_subkeys );
+ len += tdb_pack(buffer+len, buflen-len, "d", num_subkeys);
/* pack all the strings */
for (i=0; i<num_subkeys; i++) {
- len += tdb_pack( buffer+len, buflen-len, "f", regsubkey_ctr_specific_key(ctr, i) );
- if ( len > buflen ) {
- /* allocate some extra space */
- if ((buffer = (uint8 *)SMB_REALLOC( buffer, len*2 )) == NULL) {
- DEBUG(0,("regdb_store_keys: Failed to realloc memory of size [%d]\n", len*2));
+ size_t thistime;
+
+ thistime = tdb_pack(buffer+len, buflen-len, "f",
+ regsubkey_ctr_specific_key(ctr, i));
+ if (len+thistime > buflen) {
+ size_t thistime2;
+ /*
+ * tdb_pack hasn't done anything because of the short
+ * buffer, allocate extra space.
+ */
+ buffer = SMB_REALLOC_ARRAY(buffer, uint8_t,
+ (len+thistime)*2);
+ if(buffer == NULL) {
+ DEBUG(0, ("regdb_store_keys: Failed to realloc "
+ "memory of size [%u]\n",
+ (unsigned int)(len+thistime)*2));
+ ret = false;
+ goto done;
+ }
+ buflen = (len+thistime)*2;
+ thistime2 = tdb_pack(
+ buffer+len, buflen-len, "f",
+ regsubkey_ctr_specific_key(ctr, i));
+ if (thistime2 != thistime) {
+ DEBUG(0, ("tdb_pack failed\n"));
ret = false;
goto done;
}
- buflen = len*2;
-
- len = tdb_pack( buffer+len, buflen-len, "f", regsubkey_ctr_specific_key(ctr, i) );
}
+ len += thistime;
}
/* finally write out the data */
dbuf.dptr = buffer;
dbuf.dsize = len;
- if ( tdb_store_bystring( tdb_reg->tdb, keyname, dbuf, TDB_REPLACE ) == -1) {
+ status = dbwrap_store_bystring(regdb, keyname, dbuf, TDB_REPLACE);
+ if (!NT_STATUS_IS_OK(status)) {
ret = false;
goto done;
}
done:
- SAFE_FREE( buffer );
+ TALLOC_FREE(ctx);
+ SAFE_FREE(buffer);
return ret;
}
char *path = NULL;
REGSUBKEY_CTR *subkeys = NULL, *old_subkeys = NULL;
char *oldkeyname = NULL;
- TALLOC_CTX *ctx = talloc_tos();
+ TALLOC_CTX *ctx = talloc_stackframe();
+ NTSTATUS status;
+
+ if (!regdb_key_is_base_key(key) && !regdb_key_exists(key)) {
+ goto fail;
+ }
/*
* fetch a list of the old subkeys so we can determine if anything has
* changed
*/
- if (!(old_subkeys = TALLOC_ZERO_P(ctr, REGSUBKEY_CTR))) {
+ if (!(old_subkeys = TALLOC_ZERO_P(ctx, REGSUBKEY_CTR))) {
DEBUG(0,("regdb_store_keys: talloc() failure!\n"));
return false;
}
regdb_fetch_keys(key, old_subkeys);
- if (ctr->num_subkeys == old_subkeys->num_subkeys) {
+ if ((ctr->num_subkeys && old_subkeys->num_subkeys) &&
+ (ctr->num_subkeys == old_subkeys->num_subkeys)) {
for (i = 0; i<ctr->num_subkeys; i++) {
if (strcmp(ctr->subkeys[i],
}
}
- if (tdb_transaction_start( tdb_reg->tdb ) == -1) {
- DEBUG(0, ("regdb_store_keys: tdb_transaction_start failed\n"));
- return false;
+ TALLOC_FREE(old_subkeys);
+
+ if (regdb->transaction_start(regdb) != 0) {
+ DEBUG(0, ("regdb_store_keys: transaction_start failed\n"));
+ goto fail;
}
/*
* Re-fetch the old keys inside the transaction
*/
- TALLOC_FREE(old_subkeys);
-
- if (!(old_subkeys = TALLOC_ZERO_P(ctr, REGSUBKEY_CTR))) {
+ if (!(old_subkeys = TALLOC_ZERO_P(ctx, REGSUBKEY_CTR))) {
DEBUG(0,("regdb_store_keys: talloc() failure!\n"));
- goto fail;
+ goto cancel;
}
regdb_fetch_keys(key, old_subkeys);
- /* store the subkey list for the parent */
-
- if (!regdb_store_keys_internal(key, ctr) ) {
- DEBUG(0,("regdb_store_keys: Failed to store new subkey list "
- "for parent [%s]\n", key));
- goto fail;
- }
+ /*
+ * Make the store operation as safe as possible without transactions:
+ *
+ * (1) For each subkey removed from ctr compared with old_subkeys:
+ *
+ * (a) First delete the value db entry.
+ *
+ * (b) Next delete the secdesc db record.
+ *
+ * (c) Then delete the subkey list entry.
+ *
+ * (2) Now write the list of subkeys of the parent key,
+ * deleting removed entries and adding new ones.
+ *
+ * (3) Finally create the subkey list entries for the added keys.
+ *
+ * This way if we crash half-way in between deleting the subkeys
+ * and storing the parent's list of subkeys, no old data can pop up
+ * out of the blue when re-adding keys later on.
+ */
- /* now delete removed keys */
+ /* (1) delete removed keys' lists (values/secdesc/subkeys) */
num_subkeys = regsubkey_ctr_numkeys(old_subkeys);
for (i=0; i<num_subkeys; i++) {
continue;
}
- path = talloc_asprintf(ctx, "%s/%s", key, oldkeyname);
+ /* (a) Delete the value list for this key */
+
+ path = talloc_asprintf(ctx, "%s/%s/%s",
+ REG_VALUE_PREFIX,
+ key,
+ oldkeyname );
if (!path) {
- goto fail;
+ goto cancel;
}
path = normalize_reg_path(ctx, path);
if (!path) {
- goto fail;
+ goto cancel;
}
- if (tdb_delete_bystring(tdb_reg->tdb, path) == -1) {
- DEBUG(1, ("Deleting %s failed\n", path));
- goto fail;
- }
-
+ /* Ignore errors here, we might have no values around */
+ dbwrap_delete_bystring(regdb, path);
TALLOC_FREE(path);
+
+ /* (b) Delete the secdesc for this key */
+
path = talloc_asprintf(ctx, "%s/%s/%s",
- REG_VALUE_PREFIX,
+ REG_SECDESC_PREFIX,
key,
oldkeyname );
if (!path) {
- goto fail;
+ goto cancel;
}
path = normalize_reg_path(ctx, path);
if (!path) {
- goto fail;
+ goto cancel;
+ }
+ status = dbwrap_delete_bystring(regdb, path);
+ /* Don't fail if there are no values around. */
+ if (!NT_STATUS_IS_OK(status) &&
+ !NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND))
+ {
+ DEBUG(1, ("Deleting %s failed: %s\n", path,
+ nt_errstr(status)));
+ goto cancel;
}
+ TALLOC_FREE(path);
+
+ /* (c) Delete the list of subkeys of this key */
- /*
- * Ignore errors here, we might have no values around
- */
- tdb_delete_bystring( tdb_reg->tdb, path );
+ path = talloc_asprintf(ctx, "%s/%s", key, oldkeyname);
+ if (!path) {
+ goto cancel;
+ }
+ path = normalize_reg_path(ctx, path);
+ if (!path) {
+ goto cancel;
+ }
+ status = dbwrap_delete_bystring(regdb, path);
+ /* Don't fail if the subkey record was not found. */
+ if (!NT_STATUS_IS_OK(status) &&
+ !NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND))
+ {
+ DEBUG(1, ("Deleting %s failed: %s\n", path,
+ nt_errstr(status)));
+ goto cancel;
+ }
TALLOC_FREE(path);
}
TALLOC_FREE(old_subkeys);
- /* now create records for any subkeys that don't already exist */
+ /* (2) store the subkey list for the parent */
+
+ if (!regdb_store_keys_internal(key, ctr) ) {
+ DEBUG(0,("regdb_store_keys: Failed to store new subkey list "
+ "for parent [%s]\n", key));
+ goto cancel;
+ }
+
+ /* (3) now create records for any subkeys that don't already exist */
num_subkeys = regsubkey_ctr_numkeys(ctr);
+
+ if (num_subkeys == 0) {
+ if (!(subkeys = TALLOC_ZERO_P(ctx, REGSUBKEY_CTR)) ) {
+ DEBUG(0,("regdb_store_keys: talloc() failure!\n"));
+ goto cancel;
+ }
+
+ if (!regdb_store_keys_internal(key, subkeys)) {
+ DEBUG(0,("regdb_store_keys: Failed to store "
+ "new record for key [%s]\n", key));
+ goto cancel;
+ }
+ TALLOC_FREE(subkeys);
+
+ }
+
for (i=0; i<num_subkeys; i++) {
path = talloc_asprintf(ctx, "%s/%s",
key,
regsubkey_ctr_specific_key(ctr, i));
if (!path) {
- goto fail;
+ goto cancel;
}
- if (!(subkeys = TALLOC_ZERO_P(ctr, REGSUBKEY_CTR)) ) {
+ if (!(subkeys = TALLOC_ZERO_P(ctx, REGSUBKEY_CTR)) ) {
DEBUG(0,("regdb_store_keys: talloc() failure!\n"));
- goto fail;
+ goto cancel;
}
if (regdb_fetch_keys( path, subkeys ) == -1) {
if (!regdb_store_keys_internal(path, subkeys)) {
DEBUG(0,("regdb_store_keys: Failed to store "
"new record for key [%s]\n", path));
- goto fail;
+ goto cancel;
}
}
TALLOC_FREE(path);
}
- if (tdb_transaction_commit( tdb_reg->tdb ) == -1) {
+ if (regdb->transaction_commit(regdb) != 0) {
DEBUG(0, ("regdb_store_keys: Could not commit transaction\n"));
- return false;
+ goto fail;
}
+ TALLOC_FREE(ctx);
return true;
- fail:
- TALLOC_FREE(old_subkeys);
- TALLOC_FREE(subkeys);
-
- if (tdb_transaction_cancel(tdb_reg->tdb) == -1) {
- smb_panic("regdb_store_keys: tdb_transaction_cancel failed\n");
+cancel:
+ if (regdb->transaction_cancel(regdb) != 0) {
+ smb_panic("regdb_store_keys: transaction_cancel failed\n");
}
+fail:
+ TALLOC_FREE(ctx);
+
return false;
}
+static TDB_DATA regdb_fetch_key_internal(TALLOC_CTX *mem_ctx, const char *key)
+{
+ char *path = NULL;
+ TDB_DATA data;
+
+ path = normalize_reg_path(mem_ctx, key);
+ if (!path) {
+ return make_tdb_data(NULL, 0);
+ }
+
+ data = dbwrap_fetch_bystring(regdb, mem_ctx, path);
+
+ TALLOC_FREE(path);
+ return data;
+}
+
+
+/**
+ * check whether a given key name represents a base key,
+ * i.e one without a subkey separator ('/' or '\').
+ */
+static bool regdb_key_is_base_key(const char *key)
+{
+ TALLOC_CTX *mem_ctx = talloc_stackframe();
+ bool ret = false;
+ char *path;
+
+ if (key == NULL) {
+ goto done;
+ }
+
+ path = normalize_reg_path(mem_ctx, key);
+ if (path == NULL) {
+ DEBUG(0, ("out of memory! (talloc failed)\n"));
+ goto done;
+ }
+
+ if (*path == '\0') {
+ goto done;
+ }
+
+ ret = (strrchr(path, '/') == NULL);
+
+done:
+ TALLOC_FREE(mem_ctx);
+ return ret;
+}
+
+
+/**
+ * Check for the existence of a key.
+ *
+ * Existence of a key is authoritatively defined by its
+ * existence in the list of subkeys of its parent key.
+ * The exeption of this are keys without a parent key,
+ * i.e. the "base" keys (HKLM, HKCU, ...).
+ */
+static bool regdb_key_exists(const char *key)
+{
+ TALLOC_CTX *mem_ctx = talloc_stackframe();
+ TDB_DATA value;
+ bool ret = false;
+ char *path, *p;
+
+ if (key == NULL) {
+ goto done;
+ }
+
+ path = normalize_reg_path(mem_ctx, key);
+ if (path == NULL) {
+ DEBUG(0, ("out of memory! (talloc failed)\n"));
+ goto done;
+ }
+
+ if (*path == '\0') {
+ goto done;
+ }
+
+ p = strrchr(path, '/');
+ if (p == NULL) {
+ /* this is a base key */
+ value = regdb_fetch_key_internal(mem_ctx, path);
+ ret = (value.dptr != NULL);
+ } else {
+ /* get the list of subkeys of the parent key */
+ uint32 num_items, len, i;
+ fstring subkeyname;
+
+ *p = '\0';
+ p++;
+ value = regdb_fetch_key_internal(mem_ctx, path);
+ if (value.dptr == NULL) {
+ goto done;
+ }
+
+ len = tdb_unpack(value.dptr, value.dsize, "d", &num_items);
+ for (i = 0; i < num_items; i++) {
+ len += tdb_unpack(value.dptr +len, value.dsize -len,
+ "f", &subkeyname);
+ if (strequal(subkeyname, p)) {
+ ret = true;
+ goto done;
+ }
+ }
+ }
+
+done:
+ TALLOC_FREE(mem_ctx);
+ return ret;
+}
+
+
/***********************************************************************
Retrieve an array of strings containing subkeys. Memory should be
released by the caller.
int regdb_fetch_keys(const char *key, REGSUBKEY_CTR *ctr)
{
- char *path = NULL;
uint32 num_items;
- TDB_DATA dbuf;
uint8 *buf;
uint32 buflen, len;
int i;
fstring subkeyname;
int ret = -1;
TALLOC_CTX *frame = talloc_stackframe();
+ TDB_DATA value;
DEBUG(11,("regdb_fetch_keys: Enter key => [%s]\n", key ? key : "NULL"));
- path = talloc_strdup(talloc_tos(), key);
- if (!path) {
- goto fail;
- }
-
- /* convert to key format */
- path = talloc_string_sub(talloc_tos(), path, "\\", "/");
- if (!path) {
- goto fail;
- }
- strupper_m(path);
-
- if (tdb_read_lock_bystring_with_timeout(tdb_reg->tdb, path, 10) == -1) {
- return 0;
+ if (!regdb_key_exists(key)) {
+ goto done;
}
- dbuf = tdb_fetch_bystring(tdb_reg->tdb, path);
ctr->seqnum = regdb_get_seqnum();
- tdb_read_unlock_bystring(tdb_reg->tdb, path);
-
-
- buf = dbuf.dptr;
- buflen = dbuf.dsize;
+ value = regdb_fetch_key_internal(frame, key);
- if ( !buf ) {
- DEBUG(5,("regdb_fetch_keys: tdb lookup failed to locate key [%s]\n", key));
- goto fail;
+ if (value.dptr == NULL) {
+ DEBUG(10, ("regdb_fetch_keys: no subkeys found for key [%s]\n",
+ key));
+ ret = 0;
+ goto done;
}
+ buf = value.dptr;
+ buflen = value.dsize;
len = tdb_unpack( buf, buflen, "d", &num_items);
+ /*
+ * The following code breaks the abstraction that reg_objects.c sets
+ * up with regsubkey_ctr_addkey(). But if we use that with the current
+ * data structure of ctr->subkeys being an unsorted array, we end up
+ * with an O(n^2) algorithm for retrieving keys from the tdb
+ * file. This is pretty pointless, as we have to trust the data
+ * structure on disk not to have duplicates anyway. The alternative to
+ * breaking this abstraction would be to set up a more sophisticated
+ * data structure in REGSUBKEY_CTR.
+ *
+ * This makes "net conf list" for a registry with >1000 shares
+ * actually usable :-)
+ */
+
+ ctr->subkeys = talloc_array(ctr, char *, num_items);
+ if (ctr->subkeys == NULL) {
+ DEBUG(5, ("regdb_fetch_keys: could not allocate subkeys\n"));
+ goto done;
+ }
+ ctr->num_subkeys = num_items;
+
for (i=0; i<num_items; i++) {
len += tdb_unpack(buf+len, buflen-len, "f", subkeyname);
- regsubkey_ctr_addkey(ctr, subkeyname);
+ ctr->subkeys[i] = talloc_strdup(ctr->subkeys, subkeyname);
+ if (ctr->subkeys[i] == NULL) {
+ DEBUG(5, ("regdb_fetch_keys: could not allocate "
+ "subkeyname\n"));
+ TALLOC_FREE(ctr->subkeys);
+ ctr->num_subkeys = 0;
+ goto done;
+ }
}
- SAFE_FREE(dbuf.dptr);
-
DEBUG(11,("regdb_fetch_keys: Exit [%d] items\n", num_items));
ret = num_items;
- fail:
+done:
TALLOC_FREE(frame);
return ret;
}
int regdb_fetch_values( const char* key, REGVAL_CTR *values )
{
- TDB_DATA data;
char *keystr = NULL;
- TALLOC_CTX *ctx = talloc_tos();
+ TALLOC_CTX *ctx = talloc_stackframe();
+ int ret = 0;
+ TDB_DATA value;
DEBUG(10,("regdb_fetch_values: Looking for value of key [%s] \n", key));
- keystr = talloc_asprintf(ctx, "%s/%s", REG_VALUE_PREFIX, key);
- if (!keystr) {
- return 0;
- }
- keystr = normalize_reg_path(ctx, keystr);
- if (!keystr) {
- return 0;
+ if (!regdb_key_exists(key)) {
+ goto done;
}
- if (tdb_read_lock_bystring_with_timeout(tdb_reg->tdb, keystr, 10) == -1) {
- return 0;
+ keystr = talloc_asprintf(ctx, "%s/%s", REG_VALUE_PREFIX, key);
+ if (!keystr) {
+ goto done;
}
- data = tdb_fetch_bystring(tdb_reg->tdb, keystr);
values->seqnum = regdb_get_seqnum();
- tdb_read_unlock_bystring(tdb_reg->tdb, keystr);
+ value = regdb_fetch_key_internal(ctx, keystr);
- if (!data.dptr) {
+ if (!value.dptr) {
/* all keys have zero values by default */
- return 0;
+ goto done;
}
- regdb_unpack_values(values, data.dptr, data.dsize);
+ regdb_unpack_values(values, value.dptr, value.dsize);
+ ret = regval_ctr_numvals(values);
- SAFE_FREE(data.dptr);
- return regval_ctr_numvals(values);
+done:
+ TALLOC_FREE(ctx);
+ return ret;
}
bool regdb_store_values( const char *key, REGVAL_CTR *values )
{
TDB_DATA old_data, data;
char *keystr = NULL;
- TALLOC_CTX *ctx = talloc_tos();
- int len, ret;
+ TALLOC_CTX *ctx = talloc_stackframe();
+ int len;
+ NTSTATUS status;
+ bool result = false;
DEBUG(10,("regdb_store_values: Looking for value of key [%s] \n", key));
+ if (!regdb_key_exists(key)) {
+ goto done;
+ }
+
ZERO_STRUCT(data);
len = regdb_pack_values(values, data.dptr, data.dsize);
if (len <= 0) {
DEBUG(0,("regdb_store_values: unable to pack values. len <= 0\n"));
- return false;
+ goto done;
}
- data.dptr = SMB_MALLOC_ARRAY( uint8, len );
+ data.dptr = TALLOC_ARRAY(ctx, uint8, len);
data.dsize = len;
len = regdb_pack_values(values, data.dptr, data.dsize);
keystr = talloc_asprintf(ctx, "%s/%s", REG_VALUE_PREFIX, key );
if (!keystr) {
- SAFE_FREE(data.dptr);
- return false;
+ goto done;
}
keystr = normalize_reg_path(ctx, keystr);
if (!keystr) {
- SAFE_FREE(data.dptr);
- return false;
+ goto done;
}
- old_data = tdb_fetch_bystring(tdb_reg->tdb, keystr);
+ old_data = dbwrap_fetch_bystring(regdb, ctx, keystr);
if ((old_data.dptr != NULL)
&& (old_data.dsize == data.dsize)
- && (memcmp(old_data.dptr, data.dptr, data.dsize) == 0)) {
- SAFE_FREE(old_data.dptr);
- SAFE_FREE(data.dptr);
- return true;
+ && (memcmp(old_data.dptr, data.dptr, data.dsize) == 0))
+ {
+ result = true;
+ goto done;
}
- ret = tdb_trans_store_bystring(tdb_reg->tdb, keystr, data, TDB_REPLACE);
+ status = dbwrap_trans_store_bystring(regdb, keystr, data, TDB_REPLACE);
- SAFE_FREE( old_data.dptr );
- SAFE_FREE( data.dptr );
+ result = NT_STATUS_IS_OK(status);
- return ret != -1 ;
+done:
+ TALLOC_FREE(ctx);
+ return result;
}
static WERROR regdb_get_secdesc(TALLOC_CTX *mem_ctx, const char *key,
char *tdbkey;
TDB_DATA data;
NTSTATUS status;
+ TALLOC_CTX *tmp_ctx = talloc_stackframe();
+ WERROR err = WERR_OK;
DEBUG(10, ("regdb_get_secdesc: Getting secdesc of key [%s]\n", key));
- if (asprintf(&tdbkey, "%s/%s", REG_SECDESC_PREFIX, key) == -1) {
- return WERR_NOMEM;
+ if (!regdb_key_exists(key)) {
+ err = WERR_BADFILE;
+ goto done;
}
- normalize_dbkey(tdbkey);
- data = tdb_fetch_bystring(tdb_reg->tdb, tdbkey);
- SAFE_FREE(tdbkey);
+ tdbkey = talloc_asprintf(tmp_ctx, "%s/%s", REG_SECDESC_PREFIX, key);
+ if (tdbkey == NULL) {
+ err = WERR_NOMEM;
+ goto done;
+ }
+ normalize_dbkey(tdbkey);
+ data = dbwrap_fetch_bystring(regdb, tmp_ctx, tdbkey);
if (data.dptr == NULL) {
- return WERR_BADFILE;
+ err = WERR_BADFILE;
+ goto done;
}
status = unmarshall_sec_desc(mem_ctx, (uint8 *)data.dptr, data.dsize,
psecdesc);
- SAFE_FREE(data.dptr);
-
if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MEMORY)) {
- return WERR_NOMEM;
+ err = WERR_NOMEM;
+ } else if (!NT_STATUS_IS_OK(status)) {
+ err = WERR_REG_CORRUPT;
}
- if (!NT_STATUS_IS_OK(status)) {
- return WERR_REG_CORRUPT;
- }
-
- return WERR_OK;
+done:
+ TALLOC_FREE(tmp_ctx);
+ return err;
}
static WERROR regdb_set_secdesc(const char *key,
struct security_descriptor *secdesc)
{
- prs_struct ps;
- TALLOC_CTX *mem_ctx;
+ TALLOC_CTX *mem_ctx = talloc_stackframe();
char *tdbkey;
+ NTSTATUS status;
WERROR err = WERR_NOMEM;
TDB_DATA tdbdata;
- if (!(mem_ctx = talloc_init("regdb_set_secdesc"))) {
- return WERR_NOMEM;
+ if (!regdb_key_exists(key)) {
+ err = WERR_BADFILE;
+ goto done;
}
- ZERO_STRUCT(ps);
-
- if (!(tdbkey = talloc_asprintf(mem_ctx, "%s/%s", REG_SECDESC_PREFIX,
- key))) {
+ tdbkey = talloc_asprintf(mem_ctx, "%s/%s", REG_SECDESC_PREFIX, key);
+ if (tdbkey == NULL) {
goto done;
}
normalize_dbkey(tdbkey);
if (secdesc == NULL) {
/* assuming a delete */
- int tdb_ret;
-
- tdb_ret = tdb_trans_delete(tdb_reg->tdb,
- string_term_tdb_data(tdbkey));
- if (tdb_ret == -1) {
- err = ntstatus_to_werror(map_nt_error_from_unix(errno));
- } else {
+ status = dbwrap_trans_delete_bystring(regdb, tdbkey);
+ if (NT_STATUS_IS_OK(status)) {
err = WERR_OK;
+ } else {
+ err = ntstatus_to_werror(status);
}
-
goto done;
}
goto done;
}
- if (tdb_trans_store_bystring(tdb_reg->tdb, tdbkey, tdbdata, 0) == -1) {
- err = ntstatus_to_werror(map_nt_error_from_unix(errno));
+ status = dbwrap_trans_store_bystring(regdb, tdbkey, tdbdata, 0);
+ if (!NT_STATUS_IS_OK(status)) {
+ err = ntstatus_to_werror(status);
goto done;
}
done:
- prs_mem_free(&ps);
TALLOC_FREE(mem_ctx);
return err;
}
*/
REGISTRY_OPS regdb_ops = {
- regdb_fetch_keys,
- regdb_fetch_values,
- regdb_store_keys,
- regdb_store_values,
- NULL,
- regdb_get_secdesc,
- regdb_set_secdesc,
- regdb_subkeys_need_update,
- regdb_values_need_update
+ .fetch_subkeys = regdb_fetch_keys,
+ .fetch_values = regdb_fetch_values,
+ .store_subkeys = regdb_store_keys,
+ .store_values = regdb_store_values,
+ .get_secdesc = regdb_get_secdesc,
+ .set_secdesc = regdb_set_secdesc,
+ .subkeys_need_update = regdb_subkeys_need_update,
+ .values_need_update = regdb_values_need_update
};
git.samba.org / jra / samba / .git / blobdiff