diff options
| author | Jeremy Allison <jra@samba.org> | 2018-05-17 11:21:14 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2018-05-25 18:39:24 +0200 |
| commit | 7d3059cd7415c8da429f1f18cc562c6d138d77cf (patch) | |
| tree | 13af9fa6977d669dd9276df75d654c59aa51fd43 | |
| parent | b8477abbdefade3e7c005f77cc8aaf7da1bcc25a (diff) | |
| download | samba-7d3059cd7415c8da429f1f18cc562c6d138d77cf.tar.gz | |
s3: torture: Remove cmd_chmod_acl().
No longer needed.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
| -rw-r--r-- | docs-xml/manpages/vfstest.1.xml | 1 | ||||
| -rw-r--r-- | source3/torture/cmd_vfs.c | 32 |
2 files changed, 0 insertions, 33 deletions
diff --git a/docs-xml/manpages/vfstest.1.xml b/docs-xml/manpages/vfstest.1.xml index 9990e2778b1..5a4ea1254b9 100644 --- a/docs-xml/manpages/vfstest.1.xml +++ b/docs-xml/manpages/vfstest.1.xml @@ -125,7 +125,6 @@ <listitem><para><command>fset_nt_acl</command> - VFS fset_nt_acl()</para></listitem> <listitem><para><command>set_nt_acl</command> - VFS open() and fset_nt_acl()</para></listitem> <listitem><para><command>fchmod_acl</command> - VFS fchmod_acl()</para></listitem> - <listitem><para><command>chmod_acl</command> - VFS chmod_acl()</para></listitem> <listitem><para><command>sys_acl_get_file</command> - VFS sys_acl_get_file()</para></listitem> <listitem><para><command>sys_acl_get_fd</command> - VFS sys_acl_get_fd()</para></listitem> <listitem><para><command>sys_acl_blob_get_file</command> - VFS sys_acl_blob_get_file()</para></listitem> diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c index a8c7685e1d3..793faf09d12 100644 --- a/source3/torture/cmd_vfs.c +++ b/source3/torture/cmd_vfs.c @@ -930,37 +930,6 @@ static NTSTATUS cmd_fchmod(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, return NT_STATUS_OK; } - -static NTSTATUS cmd_chmod_acl(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv) -{ - struct smb_filename *smb_fname = NULL; - mode_t mode; - if (argc != 3) { - printf("Usage: chmod_acl <path> <mode>\n"); - return NT_STATUS_OK; - } - - mode = atoi(argv[2]); - - smb_fname = synthetic_smb_fname(talloc_tos(), - argv[1], - NULL, - NULL, - ssf_flags()); - if (smb_fname == NULL) { - return NT_STATUS_NO_MEMORY; - } - - if (SMB_VFS_CHMOD_ACL(vfs->conn, smb_fname, mode) == -1) { - printf("chmod_acl: error=%d (%s)\n", errno, strerror(errno)); - return NT_STATUS_UNSUCCESSFUL; - } - - printf("chmod_acl: ok\n"); - return NT_STATUS_OK; -} - - static NTSTATUS cmd_fchmod_acl(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv) { int fd; @@ -2055,7 +2024,6 @@ struct cmd_set vfs_commands[] = { { "set_nt_acl", cmd_set_nt_acl, "VFS open() and fset_nt_acl()", "set_nt_acl <file>\n" }, { "fchmod_acl", cmd_fchmod_acl, "VFS fchmod_acl()", "fchmod_acl <fd> <mode>" }, - { "chmod_acl", cmd_chmod_acl, "VFS chmod_acl()", "chmod_acl <path> <mode>" }, { "sys_acl_get_file", cmd_sys_acl_get_file, "VFS sys_acl_get_file()", "sys_acl_get_file <path>" }, { "sys_acl_get_fd", cmd_sys_acl_get_fd, "VFS sys_acl_get_fd()", "sys_acl_get_fd <fd>" }, { "sys_acl_blob_get_file", cmd_sys_acl_blob_get_file, |