From: Ralph Boehme <slow@samba.org>
Date: Mon, 23 Nov 2020 05:40:16 +0000 (+0100)
Subject: smbd: use common exit in filename_convert_internal()
X-Git-Tag: samba-4.14.0rc1~361
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d29ab04d810fa05140b347928872185ae54fff6;p=thirdparty%2Fsamba.git

smbd: use common exit in filename_convert_internal()

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 20e44a76204..a89f3047bac 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1970,11 +1970,7 @@ static NTSTATUS filename_convert_internal(TALLOC_CTX *ctx,
 			TALLOC_FREE(smb_fname);
 			return status;
 		}
-		*_smb_fname = smb_fname;
-		return NT_STATUS_OK;
-	}
-
-	if (!smbreq) {
+	} else if (!smbreq) {
 		status = check_name(conn, smb_fname);
 	} else {
 		status = check_name_with_privilege(conn, smbreq,