]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: Remove the wrapper srvstr_get_path_req_wcard().
authorJeremy Allison <jra@samba.org>
Tue, 29 Sep 2020 20:58:22 +0000 (13:58 -0700)
committerRalph Boehme <slow@samba.org>
Wed, 30 Sep 2020 20:46:41 +0000 (20:46 +0000)
Rename srvstr_get_path_req_wcard() -> srvstr_get_path_req()
as it no longer gets ward status.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/reply.c

index a6a54827ad6d0a66a37c7d2cad2d0d3b0dfa5405..04a8074548977772dbb7f0212bf4d87af43f3d2f 100644 (file)
@@ -357,10 +357,11 @@ size_t srvstr_get_path_posix(TALLOC_CTX *ctx,
 }
 
 
-static size_t srvstr_get_path_req_wcard(TALLOC_CTX *mem_ctx, struct smb_request *req,
+size_t srvstr_get_path_req(TALLOC_CTX *mem_ctx, struct smb_request *req,
                                 char **pp_dest, const char *src, int flags,
-                                NTSTATUS *err, bool *contains_wcard)
+                                NTSTATUS *err)
 {
+       bool ignore;
        ssize_t bufrem = smbreq_bufrem(req, src);
 
        if (bufrem < 0) {
@@ -378,7 +379,7 @@ static size_t srvstr_get_path_req_wcard(TALLOC_CTX *mem_ctx, struct smb_request
                                flags,
                                true,
                                err,
-                               contains_wcard);
+                               &ignore);
        } else {
                return srvstr_get_path_wcard_internal(mem_ctx,
                                (const char *)req->inbuf,
@@ -389,19 +390,10 @@ static size_t srvstr_get_path_req_wcard(TALLOC_CTX *mem_ctx, struct smb_request
                                flags,
                                false,
                                err,
-                               contains_wcard);
+                               &ignore);
        }
 }
 
-size_t srvstr_get_path_req(TALLOC_CTX *mem_ctx, struct smb_request *req,
-                          char **pp_dest, const char *src, int flags,
-                          NTSTATUS *err)
-{
-       bool ignore;
-       return srvstr_get_path_req_wcard(mem_ctx, req, pp_dest, src,
-                                        flags, err, &ignore);
-}
-
 /**
  * pull a string from the smb_buf part of a packet. In this case the
  * string can either be null terminated or it can be terminated by the