git.samba.org
/
amitay
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c2c749
)
s3/lib: fsp_str_dbg() doesn't show a possible stream name
author
Ralph Boehme
<slow@samba.org>
Tue, 23 Jun 2020 10:14:48 +0000
(12:14 +0200)
committer
Jeremy Allison
<jra@samba.org>
Sat, 18 Jul 2020 05:58:41 +0000
(
05:58
+0000)
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/lib/filename_util.c
patch
|
blob
|
history
diff --git
a/source3/lib/filename_util.c
b/source3/lib/filename_util.c
index 418dd20327b00e8217b807ca27691a85c11abee0..84a248eb766a443ec593a2526debacc41a195c8e 100644
(file)
--- a/
source3/lib/filename_util.c
+++ b/
source3/lib/filename_util.c
@@
-195,10
+195,15
@@
const char *fsp_str_dbg(const struct files_struct *fsp)
return name;
}
+ name = smb_fname_str_dbg(fsp->fsp_name);
+ if (name == NULL) {
+ return "";
+ }
+
name = talloc_asprintf(talloc_tos(),
"%s/%s",
fsp->dirfsp->fsp_name->base_name,
-
fsp->fsp_name->base_
name);
+ name);
if (name == NULL) {
return "";
}