summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-09-14 18:24:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:30:47 -0500
commitb91b78530697556aec7764de9ef16735cdd22902 (patch)
tree8d4d039b08cdadc177cfa9f7426d3bf3a1a29fb2 /source3
parentab9d7bf4f950a78d9ca7973294d133290c99096c (diff)
downloadsamba-b91b78530697556aec7764de9ef16735cdd22902.tar.gz
samba-b91b78530697556aec7764de9ef16735cdd22902.tar.bz2
samba-b91b78530697556aec7764de9ef16735cdd22902.zip
r25167: Fix breakage from mangling rewrite. Use the
new name if unmangling succeeded, not if it failed. Jerry - please re-test, this should fix your bug. Jeremy. (This used to be commit c215d6e84929b70e4472e19f32ec4f1db7449d90)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/filename.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index f15c107711..fb8ed07ee8 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -755,7 +755,8 @@ static BOOL scan_directory(connection_struct *conn, const char *path,
name,
&unmangled_name,
conn->params);
- if (mangled) {
+ if (!mangled) {
+ /* Name is now unmangled. */
name = unmangled_name;
}
}