From: Christof Schmitt Date: Tue, 16 Jul 2019 22:50:36 +0000 (-0700) Subject: nfs4_acls: Remove redundant logging from smbacl4_fill_ace4 X-Git-Tag: tdb-1.4.2~540 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ab0003ffc098247c3ee3962d7061f2af5a2d00e;p=thirdparty%2Fsamba.git nfs4_acls: Remove redundant logging from smbacl4_fill_ace4 Logging flags in case they do not match seems unnecessary. Other log messages should show the flags as well. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14032 Signed-off-by: Christof Schmitt Reviewed-by: Ralph Boehme --- diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index c4412801109..fec1f3f8876 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -746,14 +746,6 @@ static int smbacl4_fill_ace4( se_map_generic(&ace_v4->aceMask, &file_generic_mapping); - if (ace_v4->aceFlags!=ace_nt->flags) - DEBUG(9, ("ace_v4->aceFlags(0x%x)!=ace_nt->flags(0x%x)\n", - ace_v4->aceFlags, ace_nt->flags)); - - if (ace_v4->aceMask!=ace_nt->access_mask) - DEBUG(9, ("ace_v4->aceMask(0x%x)!=ace_nt->access_mask(0x%x)\n", - ace_v4->aceMask, ace_nt->access_mask)); - if (dom_sid_equal(&ace_nt->trustee, &global_sid_World)) { ace_v4->who.special_id = SMB_ACE4_WHO_EVERYONE; ace_v4->flags |= SMB_ACE4_ID_SPECIAL;