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>

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index b172ed92c6e6fc2b0095b149eeb9f1a2bd916337..a47afda4a8424057bdccf4b7df841d2193c452aa 100644 (file)
--- 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 ea86515a9253a0bd155526ed92c9abca7fe1a6fc..3b46d9f12038382103dfb69b9023a7d5c983d4db 100644 (file)
--- 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 c64a5d01eda8c6698cf07bf468c71dca0faa1647..234e2967cb01441c8a7a994fcb8e4fb22e73bdd1 100644 (file)
--- 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 5f763d4ab4d114ae963c3edab174dd2b6c41b733..fd1351aae55b6c6e84524c0981de4f069efd4686 100644 (file)
--- 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;
                        }