s3: smbd: dptr_create() doesn't need a separate wcard_has_wild parameter.

It can figure this out by itself.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 41c760ec943db1ebbcc0c3a7f7cbd27d69636be7..6a2538549e4b78a253b7373d7041c6568ffdad91 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -204,7 +204,6 @@ NTSTATUS dptr_create(connection_struct *conn,
                bool expect_close,
                uint16_t spid,
                const char *wcard,
-               bool wcard_has_wild,
                uint32_t attr,
                struct dptr_struct **dptr_ret)
 {
@@ -261,7 +260,7 @@ NTSTATUS dptr_create(connection_struct *conn,
                        (wcard[0] == '.' && wcard[1] == 0)) {
                dptr->has_wild = True;
        } else {
-               dptr->has_wild = wcard_has_wild;
+               dptr->has_wild = ms_has_wild(dptr->wcard);
        }
 
        dptr->attr = attr;

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 2e2480d7075a3df4cd7b433b275814dec5a51234..be960a80c8eb449d9551c52869f7467e7aa08eb3 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -198,7 +198,6 @@ NTSTATUS dptr_create(connection_struct *conn,
                bool expect_close,
                uint16_t spid,
                const char *wcard,
-               bool wcard_has_wild,
                uint32_t attr,
                struct dptr_struct **dptr_ret);
 void dptr_CloseDir(files_struct *fsp);

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index a08d3df512b44b7b2a6fc0c2cf3e1a4d13af6ffb..f10a92ec2ac74abf5baeef6d7bfd97d648faa16a 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1965,7 +1965,6 @@ void reply_search(struct smb_request *req)
                                        expect_close,
                                        req->smbpid,
                                        mask,
-                                       mask_contains_wcard,
                                        dirtype,
                                        &fsp->dptr);
 

diff --git a/source3/smbd/smb2_query_directory.c b/source3/smbd/smb2_query_directory.c
index 66bc932925ba73ebc386a782901cd4da4fb6618d..b8b53e27739d96aa8a1a06eee64b4fd2596dc98d 100644 (file)
--- a/source3/smbd/smb2_query_directory.c
+++ b/source3/smbd/smb2_query_directory.c
@@ -459,7 +459,6 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx,
                                     false, /* expect_close */
                                     0, /* spid */
                                     state->in_file_name, /* wcard */
-                                    wcard_has_wild,
                                     state->dirtype,
                                     &fsp->dptr);
                if (!NT_STATUS_IS_OK(status)) {

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index d4cc62de502263a64245697a15a545d0d393e7d3..1ab0195d951618e3e4be8f9eb051489314c11d08 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3017,7 +3017,6 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                                True,
                                req->smbpid,
                                mask,
-                               mask_contains_wcard,
                                dirtype,
                                &fsp->dptr);