diff options
| author | Jeremy Allison <jra@samba.org> | 2021-12-01 13:03:03 -0800 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2021-12-09 18:06:35 +0000 |
| commit | 098d63a219c3db0406fecca853ea1798cf50cb1b (patch) | |
| tree | c026474f73694eeb1c93a38f7daeb8b4e71ee028 | |
| parent | 42985702df0485208fc46117ea73622f1a9e4a26 (diff) | |
| download | samba-098d63a219c3db0406fecca853ea1798cf50cb1b.tar.gz | |
s3: smbd: Remove 'bool has_wild' parameter from unlink_internals().
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
| -rw-r--r-- | source3/printing/nt_printing.c | 2 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 3 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 5 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index b172ed92c6e..a47afda4a84 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -2042,7 +2042,7 @@ static NTSTATUS driver_unlink_internals(connection_struct *conn, goto err_out; } - status = unlink_internals(conn, NULL, 0, smb_fname, false); + status = unlink_internals(conn, NULL, 0, smb_fname); err_out: talloc_free(tmp_ctx); return status; diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index ea86515a925..3b46d9f1203 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -991,8 +991,7 @@ void reply_ctemp(struct smb_request *req); NTSTATUS unlink_internals(connection_struct *conn, struct smb_request *req, uint32_t dirtype, - struct smb_filename *smb_fname, - bool has_wcard); + struct smb_filename *smb_fname); void reply_unlink(struct smb_request *req); ssize_t fake_sendfile(struct smbXsrv_connection *xconn, files_struct *fsp, off_t startpos, size_t nread); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index c64a5d01eda..234e2967cb0 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3279,8 +3279,7 @@ static NTSTATUS do_unlink(connection_struct *conn, NTSTATUS unlink_internals(connection_struct *conn, struct smb_request *req, uint32_t dirtype, - struct smb_filename *smb_fname, - bool has_wild) + struct smb_filename *smb_fname) { char *fname_dir = NULL; char *fname_mask = NULL; @@ -3402,7 +3401,7 @@ void reply_unlink(struct smb_request *req) DEBUG(3,("reply_unlink : %s\n", smb_fname_str_dbg(smb_fname))); - status = unlink_internals(conn, req, dirtype, smb_fname, false); + status = unlink_internals(conn, req, dirtype, smb_fname); if (!NT_STATUS_IS_OK(status)) { if (open_was_deferred(req->xconn, req->mid)) { /* We have re-scheduled this call. */ diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 5f763d4ab4d..fd1351aae55 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -6517,8 +6517,7 @@ NTSTATUS hardlink_internals(TALLOC_CTX *ctx, status = unlink_internals(conn, req, FILE_ATTRIBUTE_NORMAL, - smb_fname_new, - false); + smb_fname_new); if (!NT_STATUS_IS_OK(status)) { goto out; } |