[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  c4e27ae4f69 smbd: Don't set security_descriptor_hash_v4->time
      from  d34ff44d91b s3:winbind: Fix talloc parent in find_dc() leading to a segfault

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


- Log -----------------------------------------------------------------
commit c4e27ae4f69c3a3e067db3627455175b0b427cb1
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jun 20 09:56:22 2023 +0200

    smbd: Don't set security_descriptor_hash_v4->time
    
    This prevents de-duplication of xattrs in the backend file system
    where otherwise ACLs are often very similar.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Wed Jun 21 07:11:56 UTC 2023 on atb-devel-224

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

Summary of changes:
 librpc/idl/xattr.idl             | 5 +++++
 source3/modules/vfs_acl_common.c | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/xattr.idl b/librpc/idl/xattr.idl
index 82d4ec5a473..d1cf913e9d8 100644
--- a/librpc/idl/xattr.idl
+++ b/librpc/idl/xattr.idl
@@ -204,6 +204,11 @@ interface xattr
 					 * this hash (to allow
 					 * forensics later, if we have
 					 * a bug in one codepath */
+		/*
+		 * "time" is always set to 0. Left here to avoid
+		 * bumping the union versions. Remove in case a v5 is
+		 * necessary.
+		 */
 		NTTIME time;
 		uint8 sys_acl_hash[64]; /* 64 bytes hash. */
 	} security_descriptor_hash_v4;
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index fd54d7b2dd6..7a35a946f51 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -259,9 +259,6 @@ static NTSTATUS create_sys_acl_blob(const struct security_descriptor *psd,
 	struct security_descriptor_hash_v4 sd_hs4;
 	enum ndr_err_code ndr_err;
 	TALLOC_CTX *ctx = talloc_tos();
-	NTTIME nttime_now;
-	struct timeval now = timeval_current();
-	nttime_now = timeval_to_nttime(&now);
 
 	ZERO_STRUCT(xacl);
 	ZERO_STRUCT(sd_hs4);
@@ -272,7 +269,6 @@ static NTSTATUS create_sys_acl_blob(const struct security_descriptor *psd,
 	xacl.info.sd_hs4->hash_type = hash_type;
 	memcpy(&xacl.info.sd_hs4->hash[0], hash, XATTR_SD_HASH_SIZE);
 	xacl.info.sd_hs4->description = description;
-	xacl.info.sd_hs4->time = nttime_now;
 	memcpy(&xacl.info.sd_hs4->sys_acl_hash[0], sys_acl_hash, XATTR_SD_HASH_SIZE);
 
 	ndr_err = ndr_push_struct_blob(


-- 
Samba Shared Repository