sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

When Windows attempts to create a new key, it looks for an available key name

Browse Source 
starting with "New Key #1" and iterating up to "New Key #99" before giving up.
ldb_open_key() calls reg_path_to_ldb() to build the appropriate dn from the key
name.  reg_path_to_ldb() was not catching the error returned by
ldb_dn_add_base_fmt() due to the unescaped '#' character, causing the returned
dn to be that of the parent key, not the potential new key.  Additionally,
Windows expects a return value of WERR_BADFILE when a key does not exist, but
WERR_NOT_FOUND was being returned instead.  Correcting the building of the dn
and the providing the expected return value allows new key creation to succeed.

When attempting to delete a key, Windows passes the complete path to the key,
not just the name of the child key to be deleted.  Using reg_path_to_ldb() to
build the correct dn allows key deletion to succeed.
(This used to be commit d57792d67b865ef43e7f21640b158862627f4b45)
This commit is contained in:
Andrew Kroeger 2008-01-18 02:51:51 +01:00 committed by Jelmer Vernooij
parent 85d60d2d09
commit e490415e2e
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source4/lib/registry/ldb.c
View File

@ -168,7 +168,13 @@ static struct ldb_dn *reg_path_to_ldb(TALLOC_CTX *mem_ctx,
else keyname = mypath;
if(strlen(keyname)) {
ldb_dn_add_base_fmt(ret, "key=%s", keyname);
if (!ldb_dn_add_base_fmt(ret, "key=%s",
reg_ldb_escape(local_ctx,
keyname)))
{
talloc_free(local_ctx);
return NULL;
}
}
if(begin) {
@ -430,18 +436,18 @@ static WERROR ldb_add_key(TALLOC_CTX *mem_ctx, const struct hive_key *parent,
return WERR_OK;
}
static WERROR ldb_del_key(const struct hive_key *key, const char *child)
static WERROR ldb_del_key(const struct hive_key *key, const char *name)
{
int ret;
struct ldb_key_data *parentkd = talloc_get_type(key, struct ldb_key_data);
struct ldb_dn *childdn;
struct ldb_dn *ldap_path;
TALLOC_CTX *mem_ctx = talloc_init("ldb_del_key");
childdn = ldb_dn_copy(parentkd->ldb, parentkd->dn);
ldb_dn_add_child_fmt(childdn, "key=%s", child);
ldap_path = reg_path_to_ldb(mem_ctx, key, name, NULL);
ret = ldb_delete(parentkd->ldb, childdn);
ret = ldb_delete(parentkd->ldb, ldap_path);
talloc_free(childdn);
talloc_free(mem_ctx);
if (ret == LDB_ERR_NO_SUCH_OBJECT) {
return WERR_NOT_FOUND;

7
source4/rpc_server/winreg/rpc_winreg.c
View File

@ -356,6 +356,13 @@ static WERROR dcesrv_winreg_OpenKey(struct dcesrv_call_state *dce_call,
r->out.handle = &newh->wire_handle;
} else {
talloc_free(newh);
/*
* Windows expects WERR_BADFILE when a particular key
* is not found. If we receive WERR_NOT_FOUND from the lower
* layer calls, translate it here to return what is expected.
*/
if (W_ERROR_EQUAL(result, WERR_NOT_FOUND))
return WERR_BADFILE;
}
return result;