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

smbd: Simplify make_connection_snum()

Browse Source 
Avoid nested if's, don't check for ISDIR twice

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2024-10-11 13:29:33 +02:00 committed by Ralph Boehme
parent 47c8d9b62a
commit 4b3b283b1f
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source3/smbd/smb2_service.c
View File

@ -785,22 +785,26 @@ NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
I have disabled this chdir check (tridge) */
/* the alternative is just to check the directory exists */
if ((ret = SMB_VFS_STAT(conn, smb_fname_cpath)) != 0 ||
!S_ISDIR(smb_fname_cpath->st.st_ex_mode)) {
if (ret == 0 && !S_ISDIR(smb_fname_cpath->st.st_ex_mode)) {
DBG_ERR("'%s' is not a directory, when connecting to "
"[%s]\n", conn->connectpath,
lp_const_servicename(snum));
} else {
DBG_ERR("'%s' does not exist or permission denied "
"when connecting to [%s] Error was %s\n",
conn->connectpath,
lp_const_servicename(snum),
strerror(errno));
}
ret = SMB_VFS_STAT(conn, smb_fname_cpath);
if (ret != 0) {
DBG_ERR("'%s' does not exist or permission denied "
"when connecting to [%s] Error was %s\n",
conn->connectpath,
lp_const_servicename(snum),
strerror(errno));
status = NT_STATUS_BAD_NETWORK_NAME;
goto err_root_exit;
}
if (!S_ISDIR(smb_fname_cpath->st.st_ex_mode)) {
DBG_ERR("'%s' is not a directory, when connecting to "
"[%s]\n",
conn->connectpath,
lp_const_servicename(snum));
status = NT_STATUS_BAD_NETWORK_NAME;
goto err_root_exit;
}
conn->base_share_dev = smb_fname_cpath->st.st_ex_dev;
/* Figure out the characteristics of the underlying filesystem. This