From: Volker Lendecke <vl@samba.org>
Date: Thu, 2 Nov 2023 08:13:51 +0000 (+0100)
Subject: smbd: Simplify smbd_do_qfilepathinfo()
X-Git-Tag: tdb-1.4.13~509
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4c13988c963efe2d82222235791649f0510134f;p=thirdparty%2Fsamba.git

smbd: Simplify smbd_do_qfilepathinfo()

fdos_mode(fsp) unconditionally dereferences fsp, so we can get rid of
checking for fsp!=NULL.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index 442515af377..4fa72f34978 100644
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -3021,23 +3021,12 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
 		 fsp_fnum_dbg(fsp),
 		 info_level, max_data_bytes);
 
-	/*
-	 * In case of querying a symlink in POSIX context,
-	 * fsp will be NULL. fdos_mode() deals with it.
-	 */
-	if (fsp != NULL) {
-		smb_fname = fsp->fsp_name;
-	}
+	smb_fname = fsp->fsp_name;
 	mode = fdos_mode(fsp);
 	psbuf = &smb_fname->st;
 
-	if (fsp != NULL) {
-		base_sp = fsp->base_fsp ?
-			&fsp->base_fsp->fsp_name->st :
-			&fsp->fsp_name->st;
-	} else {
-		base_sp = &smb_fname->st;
-	}
+	base_sp = (fsp->base_fsp != NULL) ? &fsp->base_fsp->fsp_name->st
+					  : &fsp->fsp_name->st;
 
 	nlink = psbuf->st_ex_nlink;