summaryrefslogtreecommitdiff
path: root/source3/smbd/nttrans.c
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-07-24 18:38:40 -0700
committerTim Prouty <tprouty@samba.org>2009-07-24 18:51:41 -0700
commitf49f3fcb0127b6ed19fec94f93658180ead04ac5 (patch)
tree0a954660d72ff5e03b6a370f3e6bad68d0ce6f74 /source3/smbd/nttrans.c
parent7197ba3abd6dfad74a28d5e3f8a73367ab22810b (diff)
downloadsamba-f49f3fcb0127b6ed19fec94f93658180ead04ac5.tar.gz
samba-f49f3fcb0127b6ed19fec94f93658180ead04ac5.tar.bz2
samba-f49f3fcb0127b6ed19fec94f93658180ead04ac5.zip
s3: Convert a few callers of unix_convert() over to filename_convert()
This patch also changes the unix convert flags to make sure the correct semantics are preservered for allowing/disallowing wildcards in the last component of the path.
Diffstat (limited to 'source3/smbd/nttrans.c')
-rw-r--r--source3/smbd/nttrans.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index dd4ef97874..b7b2634963 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1359,8 +1359,8 @@ void reply_ntrename(struct smb_request *req)
* destination's last component.
*/
if (rename_type == RENAME_FLAG_RENAME) {
- ucf_flags_src = UCF_ALLOW_WCARD_LCOMP;
- ucf_flags_dst = UCF_ALLOW_WCARD_LCOMP | UCF_SAVE_LCOMP;
+ ucf_flags_src = UCF_COND_ALLOW_WCARD_LCOMP;
+ ucf_flags_dst = UCF_COND_ALLOW_WCARD_LCOMP | UCF_SAVE_LCOMP;
}
/* rename_internals() calls unix_convert(), so don't call it here. */