From 0db1ad97f8f9540e45813c3f4140c5f51f65d3a2 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 11 Dec 2015 14:51:58 -0800 Subject: [PATCH] s3: smbd: Moving lp_posix_pathnames() out of the lower-level code. Prepare to remove lp_posix_pathnames() out of ms_has_wild(). Check before calls to ms_has_wild(). Fixup reply_search(). Don't think any client makes this call with POSIX extensions on, but this keeps the same old behavior. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/smbd/reply.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 3fad39b242d..92349789bed 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1749,7 +1749,9 @@ void reply_search(struct smb_request *req) * For a 'continue' search we have no string. So * check from the initial saved string. */ - mask_contains_wcard = ms_has_wild(mask); + if (!lp_posix_pathnames()) { + mask_contains_wcard = ms_has_wild(mask); + } dirtype = dptr_attr(sconn, dptr_num); }