[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  069d23f0a71 s3: VFS: solarisacl: Fix compile error (missed variable rename).
      from  7e6b818fea5 ktutil: Print the numeric enctype if krb5_enctype_to_string() fails

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


- Log -----------------------------------------------------------------
commit 069d23f0a717ac520560f853a5f34fd4fd92d220
Author: David Gajewski <dgajews at math.utoledo.edu>
Date:   Mon Aug 2 14:38:41 2021 -0700

    s3: VFS: solarisacl: Fix compile error (missed variable rename).
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14773
    
    Signed-off-by: David Gajewski <dgajews at math.utoledo.edu>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Fri Aug  6 17:19:57 UTC 2021 on sn-devel-184

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

Summary of changes:
 source3/modules/vfs_solarisacl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c
index 4a1d652e385..d31bda50233 100644
--- a/source3/modules/vfs_solarisacl.c
+++ b/source3/modules/vfs_solarisacl.c
@@ -204,7 +204,7 @@ int solarisacl_sys_acl_set_fd(vfs_handle_struct *handle,
 	DEBUG(10, ("solarisacl_sys_acl_set_fd %s.\n",
 		   ((ret == 0) ? "succeeded" : "failed" )));
 	SAFE_FREE(solaris_acl);
-	SAFE_FREE(default_acl);
+	SAFE_FREE(other_acl);
 	return ret;
 }
 


-- 
Samba Shared Repository