sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3: smbd: Remove 'bool has_wild' parameter from unlink_internals().

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2021-12-01 13:03:03 -08:00 committed by Ralph Boehme
parent 42985702df
commit 098d63a219
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/printing/nt_printing.c
View File

@ -2042,7 +2042,7 @@ static NTSTATUS driver_unlink_internals(connection_struct *conn,
goto err_out; goto err_out;
} }
status = unlink_internals(conn, NULL, 0, smb_fname, false); status = unlink_internals(conn, NULL, 0, smb_fname);
err_out: err_out:
talloc_free(tmp_ctx); talloc_free(tmp_ctx);
return status; return status;

3
source3/smbd/proto.h
View File

@ -991,8 +991,7 @@ void reply_ctemp(struct smb_request *req);
NTSTATUS unlink_internals(connection_struct *conn, NTSTATUS unlink_internals(connection_struct *conn,
struct smb_request *req, struct smb_request *req,
uint32_t dirtype, uint32_t dirtype,
struct smb_filename *smb_fname, struct smb_filename *smb_fname);
bool has_wcard);
void reply_unlink(struct smb_request *req); void reply_unlink(struct smb_request *req);
ssize_t fake_sendfile(struct smbXsrv_connection *xconn, files_struct *fsp, ssize_t fake_sendfile(struct smbXsrv_connection *xconn, files_struct *fsp,
off_t startpos, size_t nread); off_t startpos, size_t nread);

5
source3/smbd/reply.c
View File

@ -3279,8 +3279,7 @@ static NTSTATUS do_unlink(connection_struct *conn,
NTSTATUS unlink_internals(connection_struct *conn, NTSTATUS unlink_internals(connection_struct *conn,
struct smb_request *req, struct smb_request *req,
uint32_t dirtype, uint32_t dirtype,
struct smb_filename *smb_fname, struct smb_filename *smb_fname)
bool has_wild)
{ {
char *fname_dir = NULL; char *fname_dir = NULL;
char *fname_mask = 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))); 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 (!NT_STATUS_IS_OK(status)) {
if (open_was_deferred(req->xconn, req->mid)) { if (open_was_deferred(req->xconn, req->mid)) {
/* We have re-scheduled this call. */ /* We have re-scheduled this call. */

3
source3/smbd/trans2.c
View File

@ -6517,8 +6517,7 @@ NTSTATUS hardlink_internals(TALLOC_CTX *ctx,
status = unlink_internals(conn, status = unlink_internals(conn,
req, req,
FILE_ATTRIBUTE_NORMAL, FILE_ATTRIBUTE_NORMAL,
smb_fname_new, smb_fname_new);
false);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
goto out; goto out;
} }