From e23d8a3d1f558a7e98ef2afd71e1d15c5b3a71bc Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 21 Nov 2009 19:04:34 +0100 Subject: s3: Make the implicit reference to Protocol in mask_match() explicit --- source3/smbd/reply.c | 7 ++++--- source3/smbd/trans2.c | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 682f56ff33..a113a9d982 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2638,7 +2638,7 @@ NTSTATUS unlink_internals(connection_struct *conn, struct smb_request *req, continue; } - if(!mask_match(dname, fname_mask, + if(!mask_match(dname, fname_mask, get_Protocol(), conn->case_sensitive)) { TALLOC_FREE(frame); TALLOC_FREE(talloced); @@ -6337,7 +6337,8 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx, continue; } - if(!mask_match(dname, fname_src_mask, conn->case_sensitive)) { + if(!mask_match(dname, fname_src_mask, get_Protocol(), + conn->case_sensitive)) { TALLOC_FREE(talloced); continue; } @@ -6968,7 +6969,7 @@ void reply_copy(struct smb_request *req) continue; } - if(!mask_match(dname, fname_src_mask, + if(!mask_match(dname, fname_src_mask, get_Protocol(), conn->case_sensitive)) { TALLOC_FREE(talloced); continue; diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 17ebd81313..8226b6c428 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1368,7 +1368,7 @@ static bool smbd_dirptr_lanman2_match_fn(TALLOC_CTX *ctx, fname, mask); state->got_exact_match = got_match; if (!got_match) { - got_match = mask_match(fname, mask, + got_match = mask_match(fname, mask, get_Protocol(), state->conn->case_sensitive); } @@ -1393,6 +1393,7 @@ static bool smbd_dirptr_lanman2_match_fn(TALLOC_CTX *ctx, state->got_exact_match = got_match; if (!got_match) { got_match = mask_match(mangled_name, mask, + get_Protocol(), state->conn->case_sensitive); } } -- cgit