s3: VFS: Complete the replacement of SMB_VFS_GET_NT_ACL() -> SMB_VFS_GET_NT_ACL_AT().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu May  7 21:04:59 UTC 2020 on sn-devel-184

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 309a51ed183f08fe13ca604baf178c06a706ac8f..6eb68df3e1ee15b1a79fe55fac3edebc48d1a676 100644 (file)
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -791,15 +791,6 @@ static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle,
-                               const struct smb_filename *smb_fname,
-                               uint32_t security_info,
-                               TALLOC_CTX *mem_ctx,
-                               struct security_descriptor **ppdesc)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 static NTSTATUS skel_get_nt_acl_at(vfs_handle_struct *handle,
                                struct files_struct *dirfsp,
                                const struct smb_filename *smb_fname,
@@ -1142,7 +1133,6 @@ static struct vfs_fn_pointers skel_opaque_fns = {
        /* NT ACL operations. */
 
        .fget_nt_acl_fn = skel_fget_nt_acl,
-       .get_nt_acl_fn = skel_get_nt_acl,
        .get_nt_acl_at_fn = skel_get_nt_acl_at,
        .fset_nt_acl_fn = skel_fset_nt_acl,
 

diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 307882afadfaa0125c1a9f847db1bf342437fa32..2eb7a7dbcd99764491b71f468ca9290942825671 100644 (file)
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -1055,19 +1055,6 @@ static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
                                        ppdesc);
 }
 
-static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle,
-                               const struct smb_filename *smb_fname,
-                               uint32_t security_info,
-                               TALLOC_CTX *mem_ctx,
-                               struct security_descriptor **ppdesc)
-{
-       return SMB_VFS_NEXT_GET_NT_ACL(handle,
-                               smb_fname,
-                               security_info,
-                               mem_ctx,
-                               ppdesc);
-}
-
 static NTSTATUS skel_get_nt_acl_at(vfs_handle_struct *handle,
                                struct files_struct *dirfsp,
                                const struct smb_filename *smb_fname,
@@ -1454,7 +1441,6 @@ static struct vfs_fn_pointers skel_transparent_fns = {
        /* NT ACL operations. */
 
        .fget_nt_acl_fn = skel_fget_nt_acl,
-       .get_nt_acl_fn = skel_get_nt_acl,
        .get_nt_acl_at_fn = skel_get_nt_acl_at,
        .fset_nt_acl_fn = skel_fset_nt_acl,
 

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index c01bb3717a4a9df8ce45657898d067b61d45ff18..5861b9065f0367861c8f60b738d4b82672ca718d 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -318,7 +318,7 @@
  *              to be a struct smb_filename
  * Version 43 - convert link_contents arg of SMB_VFS_SYMLINKAT()
  *              to struct smb_filename
- * Version 43 - Add SMB_VFS_GET_NT_ACL_AT().
+ * Version 43 - Move SMB_VFS_GET_NT_ACL() -> SMB_VFS_GET_NT_ACL_AT().
  */
 
 #define SMB_VFS_INTERFACE_VERSION 43
@@ -1004,11 +1004,6 @@ struct vfs_fn_pointers {
                                   uint32_t security_info,
                                   TALLOC_CTX *mem_ctx,
                                   struct security_descriptor **ppdesc);
-       NTSTATUS (*get_nt_acl_fn)(struct vfs_handle_struct *handle,
-                                 const struct smb_filename *smb_fname,
-                                 uint32_t security_info,
-                                  TALLOC_CTX *mem_ctx,
-                                 struct security_descriptor **ppdesc);
        NTSTATUS (*get_nt_acl_at_fn)(struct vfs_handle_struct *handle,
                                struct files_struct *dirfsp,
                                const struct smb_filename *smb_fname,
@@ -1535,11 +1530,6 @@ NTSTATUS smb_vfs_call_fget_nt_acl(struct vfs_handle_struct *handle,
                                  uint32_t security_info,
                                  TALLOC_CTX *mem_ctx,
                                  struct security_descriptor **ppdesc);
-NTSTATUS smb_vfs_call_get_nt_acl(struct vfs_handle_struct *handle,
-                                const struct smb_filename *smb_fname,
-                                uint32_t security_info,
-                                TALLOC_CTX *mem_ctx,
-                                struct security_descriptor **ppdesc);
 NTSTATUS smb_vfs_call_get_nt_acl_at(struct vfs_handle_struct *handle,
                                struct files_struct *dirfsp,
                                const struct smb_filename *smb_fname,
@@ -1968,11 +1958,6 @@ NTSTATUS vfs_not_implemented_fget_nt_acl(vfs_handle_struct *handle, files_struct
                                         uint32_t security_info,
                                         TALLOC_CTX *mem_ctx,
                                         struct security_descriptor **ppdesc);
-NTSTATUS vfs_not_implemented_get_nt_acl(vfs_handle_struct *handle,
-                                       const struct smb_filename *smb_fname,
-                                       uint32_t security_info,
-                                       TALLOC_CTX *mem_ctx,
-                                       struct security_descriptor **ppdesc);
 NTSTATUS vfs_not_implemented_get_nt_acl_at(vfs_handle_struct *handle,
                        struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,

diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index c85aca91f46affa0650d5cfa6efe1bec8ce8dc8b..20fe6f9a0cf47882cae388c15fb02cb58c06ab30 100644 (file)
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -477,11 +477,6 @@
 #define SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, mem_ctx, ppdesc) \
        smb_vfs_call_fget_nt_acl((handle)->next, (fsp), (security_info), (mem_ctx), (ppdesc))
 
-#define SMB_VFS_GET_NT_ACL(conn, smb_fname, security_info, mem_ctx, ppdesc)    \
-       smb_vfs_call_get_nt_acl((conn)->vfs_handles, (smb_fname), (security_info), (mem_ctx), (ppdesc))
-#define SMB_VFS_NEXT_GET_NT_ACL(handle, smb_fname, security_info, mem_ctx, ppdesc) \
-       smb_vfs_call_get_nt_acl((handle)->next, (smb_fname), (security_info), (mem_ctx), (ppdesc))
-
 #define SMB_VFS_GET_NT_ACL_AT(conn, dirfsp, smb_fname, security_info, mem_ctx, ppdesc) \
        smb_vfs_call_get_nt_acl_at((conn)->vfs_handles, (dirfsp), (smb_fname), (security_info), (mem_ctx), (ppdesc))
 #define SMB_VFS_NEXT_GET_NT_ACL_AT(handle, dirfsp, smb_fname, security_info, mem_ctx, ppdesc) \

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 7b153186a035dcc854dfd9d814c3c18139eb7f52..c7f2020a9eadb68ab7cc0965ca69e74df19ee2c9 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -3121,24 +3121,6 @@ static NTSTATUS vfswrap_fget_nt_acl(vfs_handle_struct *handle,
        return result;
 }
 
-static NTSTATUS vfswrap_get_nt_acl(vfs_handle_struct *handle,
-                                  const struct smb_filename *smb_fname,
-                                  uint32_t security_info,
-                                  TALLOC_CTX *mem_ctx,
-                                  struct security_descriptor **ppdesc)
-{
-       NTSTATUS result;
-
-       START_PROFILE(get_nt_acl);
-       result = posix_get_nt_acl(handle->conn,
-                               smb_fname,
-                               security_info,
-                               mem_ctx,
-                               ppdesc);
-       END_PROFILE(get_nt_acl);
-       return result;
-}
-
 static NTSTATUS vfswrap_get_nt_acl_at(vfs_handle_struct *handle,
                        struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
@@ -3755,7 +3737,6 @@ static struct vfs_fn_pointers vfs_default_fns = {
        /* NT ACL operations. */
 
        .fget_nt_acl_fn = vfswrap_fget_nt_acl,
-       .get_nt_acl_fn = vfswrap_get_nt_acl,
        .get_nt_acl_at_fn = vfswrap_get_nt_acl_at,
        .fset_nt_acl_fn = vfswrap_fset_nt_acl,
        .audit_file_fn = vfswrap_audit_file,

diff --git a/source3/modules/vfs_not_implemented.c b/source3/modules/vfs_not_implemented.c
index c04704dad10fe79824cb48af2fc7fda7014dbb07..6b4abf8de67ad5004142f09187dbbe32de63c460 100644 (file)
--- a/source3/modules/vfs_not_implemented.c
+++ b/source3/modules/vfs_not_implemented.c
@@ -796,15 +796,6 @@ NTSTATUS vfs_not_implemented_fget_nt_acl(vfs_handle_struct *handle, files_struct
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-NTSTATUS vfs_not_implemented_get_nt_acl(vfs_handle_struct *handle,
-                                       const struct smb_filename *smb_fname,
-                                       uint32_t security_info,
-                                       TALLOC_CTX *mem_ctx,
-                                       struct security_descriptor **ppdesc)
-{
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 NTSTATUS vfs_not_implemented_get_nt_acl_at(vfs_handle_struct *handle,
                                        struct files_struct *dirfsp,
                                        const struct smb_filename *smb_fname,
@@ -1147,7 +1138,6 @@ static struct vfs_fn_pointers vfs_not_implemented_fns = {
        /* NT ACL operations. */
 
        .fget_nt_acl_fn = vfs_not_implemented_fget_nt_acl,
-       .get_nt_acl_fn = vfs_not_implemented_get_nt_acl,
        .get_nt_acl_at_fn = vfs_not_implemented_get_nt_acl_at,
        .fset_nt_acl_fn = vfs_not_implemented_fset_nt_acl,
 

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 044a7e1a82550956388be565c9b3644d04a2d3ab..9c75ceed6aee8a4ffa473d05f0cd89ef6f0bf4bd 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -2533,20 +2533,6 @@ NTSTATUS smb_vfs_call_fget_nt_acl(struct vfs_handle_struct *handle,
                                           mem_ctx, ppdesc);
 }
 
-NTSTATUS smb_vfs_call_get_nt_acl(struct vfs_handle_struct *handle,
-                                const struct smb_filename *smb_fname,
-                                uint32_t security_info,
-                                TALLOC_CTX *mem_ctx,
-                                struct security_descriptor **ppdesc)
-{
-       VFS_FIND(get_nt_acl);
-       return handle->fns->get_nt_acl_fn(handle,
-                               smb_fname,
-                               security_info,
-                               mem_ctx,
-                               ppdesc);
-}
-
 NTSTATUS smb_vfs_call_get_nt_acl_at(struct vfs_handle_struct *handle,
                        struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,