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

smbd: Reduce indentation in check_reduced_name()

Browse Source 
No change in behaviour.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2020-06-12 11:36:56 +02:00 committed by Jeremy Allison
parent 1e7ff44fd4
commit 1943e967a0
1 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
source3/smbd/vfs.c
View File

@ -1293,59 +1293,58 @@ NTSTATUS check_reduced_name(connection_struct *conn,
resolved_fname = SMB_VFS_REALPATH(conn, ctx, smb_fname);
if (resolved_fname == NULL) {
switch (errno) {
case ENOTDIR:
DEBUG(3,("check_reduced_name: Component not a "
"directory in getting realpath for "
"%s\n", fname));
return NT_STATUS_OBJECT_PATH_NOT_FOUND;
case ENOENT:
{
struct smb_filename *dir_fname = NULL;
struct smb_filename *last_component = NULL;
struct smb_filename *dir_fname = NULL;
struct smb_filename *last_component = NULL;
/* Last component didn't exist.
Remove it and try and canonicalise
the directory name. */
if (errno == ENOTDIR) {
DBG_NOTICE("Component not a directory in getting "
"realpath for %s\n",
fname);
return NT_STATUS_OBJECT_PATH_NOT_FOUND;
}
if (errno != ENOENT) {
NTSTATUS status = map_nt_error_from_unix(errno);
DBG_NOTICE("couldn't get realpath for %s: %s\n",
fname,
strerror(errno));
return status;
}
ok = parent_smb_fname(ctx,
smb_fname,
&dir_fname,
&last_component);
if (!ok) {
return NT_STATUS_NO_MEMORY;
}
/* errno == ENOENT */
resolved_fname = SMB_VFS_REALPATH(conn,
ctx,
dir_fname);
if (resolved_fname == NULL) {
NTSTATUS status = map_nt_error_from_unix(errno);
/*
* Last component didn't exist. Remove it and try and
* canonicalise the directory name.
*/
if (errno == ENOENT || errno == ENOTDIR) {
status = NT_STATUS_OBJECT_PATH_NOT_FOUND;
}
ok = parent_smb_fname(ctx,
smb_fname,
&dir_fname,
&last_component);
if (!ok) {
return NT_STATUS_NO_MEMORY;
}
DEBUG(3,("check_reduce_name: "
"couldn't get realpath for "
"%s (%s)\n",
smb_fname_str_dbg(dir_fname),
nt_errstr(status)));
return status;
}
resolved_name = talloc_asprintf(ctx,
resolved_fname = SMB_VFS_REALPATH(conn, ctx, dir_fname);
if (resolved_fname == NULL) {
NTSTATUS status = map_nt_error_from_unix(errno);
if (errno == ENOENT || errno == ENOTDIR) {
status = NT_STATUS_OBJECT_PATH_NOT_FOUND;
}
DBG_NOTICE("couldn't get realpath for "
"%s (%s)\n",
smb_fname_str_dbg(dir_fname),
nt_errstr(status));
return status;
}
resolved_name = talloc_asprintf(ctx,
"%s/%s",
resolved_fname->base_name,
last_component->base_name);
if (resolved_name == NULL) {
return NT_STATUS_NO_MEMORY;
}
break;
}
default:
DEBUG(3,("check_reduced_name: couldn't get "
"realpath for %s\n", fname));
return map_nt_error_from_unix(errno);
if (resolved_name == NULL) {
return NT_STATUS_NO_MEMORY;
}
} else {
resolved_name = resolved_fname->base_name;