From: Ralph Boehme <slow@samba.org>
Date: Sun, 27 Sep 2020 19:16:03 +0000 (+0200)
Subject: smbd: use fd_handle_create()
X-Git-Tag: samba-4.14.0rc1~406
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=140df3218a547f70354064f7def68d9d2d12b63d;p=thirdparty%2Fsamba.git

smbd: use fd_handle_create()

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index 04a9dfeea9d..003926c97f6 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -100,7 +100,7 @@ connection_struct *conn_new(struct smbd_server_connection *sconn)
 		TALLOC_FREE(conn);
 		return NULL;
 	}
-	conn->cwd_fsp->fh = talloc_zero(conn->cwd_fsp, struct fd_handle);
+	conn->cwd_fsp->fh = fd_handle_create(conn->cwd_fsp);
 	if (conn->cwd_fsp->fh == NULL) {
 		DBG_ERR("talloc_zero failed\n");
 		TALLOC_FREE(conn);
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index be45cc450f0..cbe09155ab3 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -46,7 +46,7 @@ NTSTATUS fsp_new(struct connection_struct *conn, TALLOC_CTX *mem_ctx,
 	 * when doing a dos/fcb open, which will then share the file_handle
 	 * across multiple fsps.
 	 */
-	fsp->fh = talloc_zero(mem_ctx, struct fd_handle);
+	fsp->fh = fd_handle_create(mem_ctx);
 	if (fsp->fh == NULL) {
 		goto fail;
 	}
diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysmbd.c
index 034d0621c02..8631390b29e 100644
--- a/source3/smbd/pysmbd.c
+++ b/source3/smbd/pysmbd.c
@@ -166,7 +166,7 @@ static NTSTATUS init_files_struct(TALLOC_CTX *mem_ctx,
 	if (fsp == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
-	fsp->fh = talloc(fsp, struct fd_handle);
+	fsp->fh = fd_handle_create(fsp);
 	if (fsp->fh == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 9bc640174b4..c972c97b7bc 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1614,7 +1614,7 @@ NTSTATUS vfs_at_fspcwd(TALLOC_CTX *mem_ctx,
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	fsp->fh = talloc_zero(fsp, struct fd_handle);
+	fsp->fh = fd_handle_create(fsp);
 	if (fsp->fh == NULL) {
 		TALLOC_FREE(fsp);
 		return NT_STATUS_NO_MEMORY;
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index cf2c4984a22..da58c0cee0d 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -378,7 +378,7 @@ static NTSTATUS cmd_open(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
 	if (fsp == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
-	fsp->fh = talloc_zero(fsp, struct fd_handle);
+	fsp->fh = fd_handle_create(fsp);
 	if (fsp->fh == NULL) {
 		TALLOC_FREE(fsp);
 		return NT_STATUS_NO_MEMORY;
@@ -1641,7 +1641,7 @@ static NTSTATUS cmd_set_nt_acl(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int a
 	if (fsp == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
-	fsp->fh = talloc_zero(fsp, struct fd_handle);
+	fsp->fh = fd_handle_create(fsp);
 	if (fsp->fh == NULL) {
 		TALLOC_FREE(fsp);
 		return NT_STATUS_NO_MEMORY;