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

registry: Implement recursive deletes for dir-backed registry.

Browse Source 
When deleting a registry key that contains subkeys or values, Windows performs a
recursive deletion that removes any subkeys or values.  This update makes
deletes for an dir-backed registry consistent with Windows.

The dir-backed registry relies on the underlying filesystem, which does not
generally have transactional integrity when performing multiple operations.
Therefore, if an error occurs during the recursive deletion, the dir-backed
registry may be left in an inconsistent state.
(This used to be commit 6b5fbf7e4e38342bcd80e63f46cd295f89ab1ee9)
This commit is contained in:
Andrew Kroeger 2008-02-16 15:15:50 -06:00
parent 7dac0598ec
commit 2bbd319caf
1 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
source4/lib/registry/dir.c
View File

@ -55,18 +55,66 @@ static WERROR reg_dir_add_key(TALLOC_CTX *mem_ctx,
return WERR_GENERAL_FAILURE;
}
static WERROR reg_dir_delete_recursive(const char *name)
{
DIR *d;
struct dirent *e;
WERROR werr;
d = opendir(name);
if (d == NULL) {
DEBUG(3,("Unable to open '%s': %s\n", name,
strerror(errno)));
return WERR_BADFILE;
}
while((e = readdir(d))) {
char *path;
struct stat stbuf;
if (ISDOT(e->d_name) || ISDOTDOT(e->d_name))
continue;
path = talloc_asprintf(name, "%s/%s", name, e->d_name);
if (!path)
return WERR_NOMEM;
stat(path, &stbuf);
if (!S_ISDIR(stbuf.st_mode)) {
if (unlink(path) < 0) {
talloc_free(path);
closedir(d);
return WERR_GENERAL_FAILURE;
}
} else {
werr = reg_dir_delete_recursive(path);
if (!W_ERROR_IS_OK(werr)) {
talloc_free(path);
closedir(d);
return werr;
}
}
talloc_free(path);
}
closedir(d);
if (rmdir(name) == 0)
return WERR_OK;
else if (errno == ENOENT)
return WERR_BADFILE;
else
return WERR_GENERAL_FAILURE;
}
static WERROR reg_dir_del_key(const struct hive_key *k, const char *name)
{
struct dir_key *dk = talloc_get_type(k, struct dir_key);
char *child = talloc_asprintf(NULL, "%s/%s", dk->path, name);
WERROR ret;
if (rmdir(child) == 0)
ret = WERR_OK;
else if (errno == ENOENT)
ret = WERR_BADFILE;
else
ret = WERR_GENERAL_FAILURE;
ret = reg_dir_delete_recursive(child);
talloc_free(child);