From: Jeremy Allison <jra@samba.org>
Date: Thu, 4 Jun 2020 04:03:39 +0000 (-0700)
Subject: s3: libsmb: Change cli_unlink() and async version to take a uint32_t attribute.
X-Git-Tag: ldb-2.2.0~197
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eb1a7f1e781bbd4b5e83ef4d69114f1c8ea4077;p=thirdparty%2Fsamba.git

s3: libsmb: Change cli_unlink() and async version to take a uint32_t attribute.

Fix the callers.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 5ae7779192c..65891e0e6a1 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -1868,7 +1868,7 @@ struct tevent_req *cli_unlink_send(TALLOC_CTX *mem_ctx,
 				struct tevent_context *ev,
 				struct cli_state *cli,
 				const char *fname,
-				uint16_t mayhave_attrs)
+				uint32_t mayhave_attrs)
 {
 	struct tevent_req *req = NULL, *subreq = NULL;
 	struct cli_unlink_state *state = NULL;
@@ -1936,7 +1936,7 @@ NTSTATUS cli_unlink_recv(struct tevent_req *req)
 	return tevent_req_simple_recv_ntstatus(req);
 }
 
-NTSTATUS cli_unlink(struct cli_state *cli, const char *fname, uint16_t mayhave_attrs)
+NTSTATUS cli_unlink(struct cli_state *cli, const char *fname, uint32_t mayhave_attrs)
 {
 	TALLOC_CTX *frame = NULL;
 	struct tevent_context *ev;
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index d0d15d31b9b..58120b06e42 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -361,9 +361,9 @@ struct tevent_req *cli_unlink_send(TALLOC_CTX *mem_ctx,
                                 struct tevent_context *ev,
                                 struct cli_state *cli,
                                 const char *fname,
-                                uint16_t mayhave_attrs);
+                                uint32_t mayhave_attrs);
 NTSTATUS cli_unlink_recv(struct tevent_req *req);
-NTSTATUS cli_unlink(struct cli_state *cli, const char *fname, uint16_t mayhave_attrs);
+NTSTATUS cli_unlink(struct cli_state *cli, const char *fname, uint32_t mayhave_attrs);
 
 struct tevent_req *cli_mkdir_send(TALLOC_CTX *mem_ctx,
 				  struct tevent_context *ev,
diff --git a/source3/libsmb/pylibsmb.c b/source3/libsmb/pylibsmb.c
index 006cc9078b8..df324da7a3d 100644
--- a/source3/libsmb/pylibsmb.c
+++ b/source3/libsmb/pylibsmb.c
@@ -1257,7 +1257,7 @@ static PyObject *py_cli_list(struct py_cli_state *self,
 static NTSTATUS unlink_file(struct py_cli_state *self, const char *filename)
 {
 	NTSTATUS status;
-	uint16_t attrs = (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+	uint32_t attrs = (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 	struct tevent_req *req = NULL;
 
 	req = cli_unlink_send(