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

smbd: Simplify ReadDirName()

Browse Source 
"fp" is only used for DBG messages where I don't think we need the
full accuracy of full_path_from_dirfsp_at_basename(). Save a talloc.

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 11:37:15 +01:00
parent e166299b18
commit 6098724e8b
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source3/smbd/dir.c
View File

@ -1225,8 +1225,9 @@ const char *ReadDirName(struct smb_Dir *dir_hnd, char **ptalloced)
* ignore tmp directories, see mkdir_internals()
*/
if (IS_SMBD_TMPNAME(n, &unlink_flags)) {
struct files_struct *dirfsp = dir_hnd->fsp;
const char *dirname = dirfsp->fsp_name->base_name;
struct smb_filename *atname = NULL;
const char *fp = NULL;
int ret;
atname = synthetic_smb_fname(talloc_tos(),
@ -1239,17 +1240,9 @@ const char *ReadDirName(struct smb_Dir *dir_hnd, char **ptalloced)
TALLOC_FREE(talloced);
continue;
}
fp = full_path_from_dirfsp_at_basename(atname,
dir_hnd->fsp,
n);
if (fp == NULL) {
TALLOC_FREE(atname);
TALLOC_FREE(talloced);
continue;
}
if (unlink_flags == INT_MAX) {
DBG_NOTICE("ignoring %s\n", fp);
DBG_NOTICE("ignoring %s/%s\n", dirname, n);
TALLOC_FREE(atname);
TALLOC_FREE(talloced);
continue;
@ -1259,18 +1252,23 @@ const char *ReadDirName(struct smb_Dir *dir_hnd, char **ptalloced)
* We remove the stale tmpname
* as root and ignore any errors
*/
DBG_NOTICE("unlink stale %s\n", fp);
DBG_NOTICE("unlink stale %s/%s\n", dirname, n);
become_root();
ret = SMB_VFS_UNLINKAT(conn,
dir_hnd->fsp,
dirfsp,
atname,
unlink_flags);
unbecome_root();
if (ret == 0) {
DBG_NOTICE("unlinked stale %s\n", fp);
DBG_NOTICE("unlinked stale %s/%s\n",
dirname,
n);
} else {
DBG_WARNING("failed to unlink stale %s: %s\n",
fp, strerror(errno));
DBG_WARNING(
"failed to unlink stale %s/%s: %s\n",
dirname,
n,
strerror(errno));
}
TALLOC_FREE(atname);
TALLOC_FREE(talloced);