From: Ralph Boehme <slow@samba.org>
Date: Sat, 2 May 2020 06:09:24 +0000 (+0200)
Subject: smbd: move a DEBUG in unix_convert()
X-Git-Tag: ldb-2.2.0~675
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d912999394feacec929bad82ed0dcfaa6e25063d;p=thirdparty%2Fsamba.git

smbd: move a DEBUG in unix_convert()

Ensure a successfull conversion via early exit also logs a message.

While at it, use smb_fname_str_dbg() to print the string which ensure any stream
component or twrp value is also printed.

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 6b3e08579ab..913f192ab2f 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1345,9 +1345,6 @@ NTSTATUS unix_convert(TALLOC_CTX *mem_ctx,
 	 * The name has been resolved.
 	 */
 
-	DBG_DEBUG("Conversion finished [%s] -> [%s]\n",
-		   state->orig_path, state->smb_fname->base_name);
-
  done:
 	/* Add back the stream if one was stripped off originally. */
 	if (state->stream != NULL) {
@@ -1359,6 +1356,10 @@ NTSTATUS unix_convert(TALLOC_CTX *mem_ctx,
 			goto fail;
 		}
 	}
+
+	DBG_DEBUG("Conversion finished [%s] -> [%s]\n",
+		   state->orig_path, smb_fname_str_dbg(state->smb_fname));
+
 	TALLOC_FREE(state->dirpath);
 	*smb_fname_out = state->smb_fname;
 	return NT_STATUS_OK;