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.*/
return WERR_OK;
}
- regdb = db_open_trans(NULL, state_path("registry.tdb"), 0,
+ regdb = db_open(NULL, state_path("registry.tdb"), 0,
REG_TDB_FLAGS, O_RDWR, 0600);
if (!regdb) {
- regdb = db_open_trans(NULL, state_path("registry.tdb"), 0,
+ 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(0,("regdb_init: Failed to open registry %s (%s)\n",
+ DEBUG(1,("regdb_init: Failed to open registry %s (%s)\n",
state_path("registry.tdb"), strerror(errno) ));
return werr;
}
vers_id, REGVER_V1));
status = dbwrap_trans_store_int32(regdb, vstring, REGVER_V1);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("regdb_init: error storing %s = %d: %s\n",
+ DEBUG(1, ("regdb_init: error storing %s = %d: %s\n",
vstring, REGVER_V1, nt_errstr(status)));
return ntstatus_to_werror(status);
} else {
become_root();
- regdb = db_open_trans(NULL, state_path("registry.tdb"), 0,
+ 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 ) );
/* 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 */
- buffer = (uint8 *)SMB_REALLOC(buffer, 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 [%d]\n", len*2));
+ "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 */
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
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 cancel;
- }
+ /*
+ * 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 cancel;
}
if (!path) {
goto cancel;
}
- status = dbwrap_delete_bystring(regdb, path);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Deleting %s failed\n", path));
- goto cancel;
- }
-
+ /* 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) {
if (!path) {
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);
- /*
- * Ignore errors here, we might have no values around
- */
- dbwrap_delete_bystring(regdb, path);
+ /* (c) Delete the list of subkeys of this key */
+
+ 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);
}
+/**
+ * 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.
*
int regdb_fetch_keys(const char *key, REGSUBKEY_CTR *ctr)
{
- WERROR werr;
uint32 num_items;
uint8 *buf;
uint32 buflen, len;
DEBUG(11,("regdb_fetch_keys: Enter key => [%s]\n", key ? key : "NULL"));
if (!regdb_key_exists(key)) {
- goto fail;
+ goto done;
}
ctr->seqnum = regdb_get_seqnum();
value = regdb_fetch_key_internal(frame, key);
+ 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);
- if ( !buf ) {
- DEBUG(5,("regdb_fetch_keys: tdb lookup failed to locate key [%s]\n", key));
- goto fail;
- }
+ /*
+ * 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 :-)
+ */
- len = tdb_unpack( buf, buflen, "d", &num_items);
+ 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);
- werr = regsubkey_ctr_addkey(ctr, subkeyname);
- if (!W_ERROR_IS_OK(werr)) {
- DEBUG(5, ("regdb_fetch_keys: regsubkey_ctr_addkey "
- "failed: %s\n", dos_errstr(werr)));
- goto fail;
+ 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;
}
}
DEBUG(11,("regdb_fetch_keys: Exit [%d] items\n", num_items));
ret = num_items;
- fail:
+done:
TALLOC_FREE(frame);
return ret;
}
goto done;
}
- status = dbwrap_trans_store(regdb, string_term_tdb_data(keystr), data,
- TDB_REPLACE);
+ status = dbwrap_trans_store_bystring(regdb, keystr, data, TDB_REPLACE);
result = NT_STATUS_IS_OK(status);
DEBUG(10, ("regdb_get_secdesc: Getting secdesc of key [%s]\n", key));
+ if (!regdb_key_exists(key)) {
+ err = WERR_BADFILE;
+ goto done;
+ }
+
tdbkey = talloc_asprintf(tmp_ctx, "%s/%s", REG_SECDESC_PREFIX, key);
if (tdbkey == NULL) {
err = WERR_NOMEM;
WERROR err = WERR_NOMEM;
TDB_DATA tdbdata;
+ if (!regdb_key_exists(key)) {
+ err = WERR_BADFILE;
+ goto done;
+ }
+
tdbkey = talloc_asprintf(mem_ctx, "%s/%s", REG_SECDESC_PREFIX, key);
if (tdbkey == NULL) {
goto done;
if (secdesc == NULL) {
/* assuming a delete */
- status = dbwrap_trans_delete(regdb,
- string_term_tdb_data(tdbkey));
+ status = dbwrap_trans_delete_bystring(regdb, tdbkey);
if (NT_STATUS_IS_OK(status)) {
err = WERR_OK;
} else {
goto done;
}
- status = dbwrap_trans_store(regdb, string_term_tdb_data(tdbkey),
- tdbdata, 0);
+ status = dbwrap_trans_store_bystring(regdb, tdbkey, tdbdata, 0);
if (!NT_STATUS_IS_OK(status)) {
err = ntstatus_to_werror(status);
goto done;
git.samba.org / jra / samba / .git / blobdiff