[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  da663b5d4f1 vfs_gpfs: Remove documentation for removed gpfs:refuse_dacl_protected option
       via  5c627988a26 vfs_gpfs: Remove support for old GPFS without DACL_PROTECTED support
      from  284afec29ff winbind: Enforce user group policy when enabled

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit da663b5d4f16478973510d3b0016e41d642fa256
Author: Christof Schmitt <cs at samba.org>
Date:   Sun Oct 23 16:04:36 2022 -0700

    vfs_gpfs: Remove documentation for removed gpfs:refuse_dacl_protected option
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15211
    
    Signed-off-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Bjoern Jacke <bjacke at samba.org>
    
    Autobuild-User(master): Björn Jacke <bjacke at samba.org>
    Autobuild-Date(master): Mon Oct 24 16:41:03 UTC 2022 on sn-devel-184

commit 5c627988a268adc8da7b1c954f3706c5c878fd3b
Author: Christof Schmitt <cs at samba.org>
Date:   Sun Oct 23 16:01:41 2022 -0700

    vfs_gpfs: Remove support for old GPFS without DACL_PROTECTED support
    
    GPFS 3.5 introduced support for storing the DACL_PROTECTED flag as part
    of the ACL. That version has long been superceded. Remove this now
    unused codepath.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15211
    
    Signed-off-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Bjoern Jacke <bjacke at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages/vfs_gpfs.8.xml | 31 -------------------------------
 source3/modules/vfs_gpfs.c       |  8 --------
 2 files changed, 39 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/vfs_gpfs.8.xml b/docs-xml/manpages/vfs_gpfs.8.xml
index a7168e43b46..29f2ac453f0 100644
--- a/docs-xml/manpages/vfs_gpfs.8.xml
+++ b/docs-xml/manpages/vfs_gpfs.8.xml
@@ -252,37 +252,6 @@
 		</varlistentry>
 		<varlistentry>
 
-		<term>gpfs:refuse_dacl_protected = [ yes | no ]</term>
-		<listitem>
-		<para>
-		As GPFS does not support the ACE4_FLAG_NO_PROPAGATE NFSv4 flag (which would be
-		the mapping for the DESC_DACL_PROTECTED flag), the status of this flag is
-		currently silently ignored by Samba. That means that if you deselect the "Allow
-		inheritable permissions..." checkbox in Windows' ACL dialog and then apply the
-		ACL, the flag will be back immediately.
-		</para>
-		<para>
-		To make sure that automatic migration with e.g. robocopy does not lead to
-		ACLs silently (and unintentionally) changed, you can set
-		<command>gpfs:refuse_dacl_protected = yes</command> to enable an explicit
-		check for this flag and if set, it will return NT_STATUS_NOT_SUPPORTED so
-		errors are shown up on the Windows side and the Administrator is aware of
-		the ACLs not being settable like intended
-		</para>
-
-		<itemizedlist>
-		<listitem><para>
-		<command>no(default)</command> - ignore the DESC_DACL_PROTECTED flags.
-		</para></listitem>
-		<listitem><para>
-		<command>yes</command> - reject ACLs with DESC_DACL_PROTECTED.
-		</para></listitem>
-		</itemizedlist>
-		</listitem>
-
-		</varlistentry>
-		<varlistentry>
-
 		<term>gpfs:dfreequota = [ yes | no ]</term>
 		<listitem>
 		<para>
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 779627f8115..969e7744fce 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -842,14 +842,6 @@ static NTSTATUS gpfsacl_set_nt_acl_internal(vfs_handle_struct *handle, files_str
 	if (acl->acl_version == GPFS_ACL_VERSION_NFS4) {
 		struct gpfs_config_data *config;
 
-		if (lp_parm_bool(fsp->conn->params->service, "gpfs",
-				 "refuse_dacl_protected", false)
-		    && (psd->type&SEC_DESC_DACL_PROTECTED)) {
-			DEBUG(2, ("Rejecting unsupported ACL with DACL_PROTECTED bit set\n"));
-			talloc_free(acl);
-			return NT_STATUS_NOT_SUPPORTED;
-		}
-
 		SMB_VFS_HANDLE_GET_DATA(handle, config,
 					struct gpfs_config_data,
 					return NT_STATUS_INTERNAL_ERROR);


-- 
Samba Shared Repository