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 04a9dfeea9d54b172e499deae2db8c728a4880e2..003926c97f6fb4a396ee3c62f680de6b517dd140 100644 (file)
--- 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 be45cc450f080195df61f7b55b578b8a444c6e31..cbe09155ab365d77fffdbc6097bd681d344de00e 100644 (file)
--- 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 034d0621c022ea355b5dda06862a8f4d9087891a..8631390b29e38a0d16dcf4158cc0672ad00421a0 100644 (file)
--- 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 9bc640174b4c3346b08c2ca11c4091d7776b3b51..c972c97b7bcb49f91441f4f19ca735866413b0b0 100644 (file)
--- 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 cf2c4984a22490a81108b7af9ebb59aa6a9c9408..da58c0cee0de191ed43a2543f15a3ea36c9fbb69 100644 (file)
--- 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;