diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-23 16:34:07 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-23 16:35:00 +0100 |
| commit | a1a81ef785b2372bd4aab0304150b0f8b0fac247 (patch) | |
| tree | f6e6b2d9c22ae6045e24aaaa8f0a6d7abdea5a97 /source3/smbd | |
| parent | d6e55d8ec0335cd2494ca54f1471fad4e2b69795 (diff) | |
| download | samba-a1a81ef785b2372bd4aab0304150b0f8b0fac247.tar.gz samba-a1a81ef785b2372bd4aab0304150b0f8b0fac247.tar.bz2 samba-a1a81ef785b2372bd4aab0304150b0f8b0fac247.zip | |
Revert "s3: Make the implicit reference to Protocol in mask_match() explicit"
This reverts commit e23d8a3d1f558a7e98ef2afd71e1d15c5b3a71bc.
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/reply.c | 7 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index a113a9d982..682f56ff33 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, get_Protocol(), + if(!mask_match(dname, fname_mask, conn->case_sensitive)) { TALLOC_FREE(frame); TALLOC_FREE(talloced); @@ -6337,8 +6337,7 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx, continue; } - if(!mask_match(dname, fname_src_mask, get_Protocol(), - conn->case_sensitive)) { + if(!mask_match(dname, fname_src_mask, conn->case_sensitive)) { TALLOC_FREE(talloced); continue; } @@ -6969,7 +6968,7 @@ void reply_copy(struct smb_request *req) continue; } - if(!mask_match(dname, fname_src_mask, get_Protocol(), + if(!mask_match(dname, fname_src_mask, conn->case_sensitive)) { TALLOC_FREE(talloced); continue; diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 8226b6c428..17ebd81313 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, get_Protocol(), + got_match = mask_match(fname, mask, state->conn->case_sensitive); } @@ -1393,7 +1393,6 @@ 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); } } |