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

smbd: simplify can_delete_directory_fsp()

Browse Source 
openat_pathref_fsp_lcomp does all of what we do here manually
anyway. Use it.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
This commit is contained in:
Volker Lendecke 2024-12-05 13:08:32 +01:00
parent 6262f9a66e
commit 9afd9fc7da
1 changed files with 49 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
source3/smbd/dir.c
View File

@ -1553,10 +1553,7 @@ NTSTATUS can_delete_directory_fsp(files_struct *fsp)
} }
while ((dname = ReadDirName(dir_hnd, &talloced))) { while ((dname = ReadDirName(dir_hnd, &talloced))) {
struct smb_filename *smb_dname_full = NULL;
struct smb_filename *direntry_fname = NULL; struct smb_filename *direntry_fname = NULL;
char *fullname = NULL;
int ret;
if (ISDOT(dname) || (ISDOTDOT(dname))) { if (ISDOT(dname) || (ISDOTDOT(dname))) {
TALLOC_FREE(talloced); TALLOC_FREE(talloced);
@ -1567,109 +1564,75 @@ NTSTATUS can_delete_directory_fsp(files_struct *fsp)
continue; continue;
} }
fullname = talloc_asprintf(talloc_tos(), direntry_fname = synthetic_smb_fname(talloc_tos(),
"%s/%s", dname,
fsp->fsp_name->base_name,
dname);
if (fullname == NULL) {
status = NT_STATUS_NO_MEMORY;
break;
}
smb_dname_full = synthetic_smb_fname(talloc_tos(),
fullname,
NULL, NULL,
NULL, NULL,
fsp->fsp_name->twrp, fsp->fsp_name->twrp,
fsp->fsp_name->flags); fsp->fsp_name->flags);
if (smb_dname_full == NULL) { TALLOC_FREE(talloced);
TALLOC_FREE(talloced); dname = NULL;
TALLOC_FREE(fullname);
if (direntry_fname == NULL) {
status = NT_STATUS_NO_MEMORY; status = NT_STATUS_NO_MEMORY;
break; break;
} }
ret = SMB_VFS_LSTAT(conn, smb_dname_full); status = openat_pathref_fsp_lcomp(
if (ret != 0) { fsp,
status = map_nt_error_from_unix(errno); direntry_fname,
TALLOC_FREE(talloced); UCF_POSIX_PATHNAMES /* no ci fallback */);
TALLOC_FREE(fullname);
TALLOC_FREE(smb_dname_full); if (!NT_STATUS_IS_OK(status)) {
DBG_DEBUG("Could not open %s: %s\n",
direntry_fname->base_name,
nt_errstr(status));
TALLOC_FREE(direntry_fname);
if (NT_STATUS_EQUAL(status,
NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
/* race between readdir and unlink */
continue;
}
status = NT_STATUS_DIRECTORY_NOT_EMPTY;
break; break;
} }
if (S_ISLNK(smb_dname_full->st.st_ex_mode)) { if (S_ISLNK(direntry_fname->st.st_ex_mode)) {
/* Could it be an msdfs link ? */ int ret;
if (lp_host_msdfs() &&
lp_msdfs_root(SNUM(conn))) { if (lp_host_msdfs() && lp_msdfs_root(SNUM(conn)) &&
struct smb_filename *smb_dname; is_msdfs_link(fsp, direntry_fname))
smb_dname = synthetic_smb_fname(talloc_tos(), {
dname,
NULL, DBG_DEBUG("got msdfs link name %s "
&smb_dname_full->st, "- can't delete directory %s\n",
fsp->fsp_name->twrp, direntry_fname->base_name,
fsp->fsp_name->flags); fsp_str_dbg(fsp));
if (smb_dname == NULL) {
TALLOC_FREE(talloced); status = NT_STATUS_DIRECTORY_NOT_EMPTY;
TALLOC_FREE(fullname);
TALLOC_FREE(smb_dname_full); TALLOC_FREE(direntry_fname);
status = NT_STATUS_NO_MEMORY; break;
break;
}
if (is_msdfs_link(fsp, smb_dname)) {
TALLOC_FREE(talloced);
TALLOC_FREE(fullname);
TALLOC_FREE(smb_dname_full);
TALLOC_FREE(smb_dname);
DBG_DEBUG("got msdfs link name %s "
"- can't delete directory %s\n",
dname,
fsp_str_dbg(fsp));
status = NT_STATUS_DIRECTORY_NOT_EMPTY;
break;
}
TALLOC_FREE(smb_dname);
} }
/* Not a DFS link - could it be a dangling symlink ? */ /* Not a DFS link - could it be a dangling symlink ? */
ret = SMB_VFS_STAT(conn, smb_dname_full); ret = SMB_VFS_FSTATAT(conn,
fsp,
direntry_fname,
&direntry_fname->st,
0 /* 0 means follow symlink */);
if (ret == -1 && (errno == ENOENT || errno == ELOOP)) { if (ret == -1 && (errno == ENOENT || errno == ELOOP)) {
/* /*
* Dangling symlink. * Dangling symlink.
* Allow if "delete veto files = yes" * Allow if "delete veto files = yes"
*/ */
if (lp_delete_veto_files(SNUM(conn))) { if (lp_delete_veto_files(SNUM(conn))) {
TALLOC_FREE(talloced); TALLOC_FREE(direntry_fname);
TALLOC_FREE(fullname);
TALLOC_FREE(smb_dname_full);
continue; continue;
} }
} }
DBG_DEBUG("got symlink name %s - "
"can't delete directory %s\n",
dname,
fsp_str_dbg(fsp));
TALLOC_FREE(talloced);
TALLOC_FREE(fullname);
TALLOC_FREE(smb_dname_full);
status = NT_STATUS_DIRECTORY_NOT_EMPTY;
break;
}
/* Not a symlink, get a pathref. */
status = synthetic_pathref(talloc_tos(),
fsp,
dname,
NULL,
&smb_dname_full->st,
fsp->fsp_name->twrp,
fsp->fsp_name->flags,
&direntry_fname);
if (!NT_STATUS_IS_OK(status)) {
status = map_nt_error_from_unix(errno);
TALLOC_FREE(talloced);
TALLOC_FREE(fullname);
TALLOC_FREE(smb_dname_full);
break;
} }
if (!is_visible_fsp(direntry_fname->fsp)) { if (!is_visible_fsp(direntry_fname->fsp)) {
@ -1678,24 +1641,18 @@ NTSTATUS can_delete_directory_fsp(files_struct *fsp)
* Allow if "delete veto files = yes" * Allow if "delete veto files = yes"
*/ */
if (lp_delete_veto_files(SNUM(conn))) { if (lp_delete_veto_files(SNUM(conn))) {
TALLOC_FREE(talloced);
TALLOC_FREE(fullname);
TALLOC_FREE(smb_dname_full);
TALLOC_FREE(direntry_fname); TALLOC_FREE(direntry_fname);
continue; continue;
} }
} }
TALLOC_FREE(talloced); DBG_DEBUG("got name %s - can't delete\n",
TALLOC_FREE(fullname); direntry_fname->base_name);
TALLOC_FREE(smb_dname_full);
TALLOC_FREE(direntry_fname); TALLOC_FREE(direntry_fname);
DBG_DEBUG("got name %s - can't delete\n", dname);
status = NT_STATUS_DIRECTORY_NOT_EMPTY; status = NT_STATUS_DIRECTORY_NOT_EMPTY;
break; break;
} }
TALLOC_FREE(talloced);
TALLOC_FREE(dir_hnd); TALLOC_FREE(dir_hnd);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {