[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  dde973d170e s4:dns_server: less noisy, more informative debug messages
      from  81598b42455 s3:libsmb_xattr: ace_compare() uses NUMERIC_CMP()

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


- Log -----------------------------------------------------------------
commit dde973d170e479632d1a411279f4f0fad6608539
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date:   Thu Apr 11 11:52:14 2024 +1200

    s4:dns_server: less noisy, more informative debug messages
    
    This shouldn't have been DBG_ERR, and it might as well say something
    about the tombstone.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15630
    
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Fri Apr 12 15:18:05 UTC 2024 on atb-devel-224

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

Summary of changes:
 source4/dns_server/dnsserver_common.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dns_server/dnsserver_common.c b/source4/dns_server/dnsserver_common.c
index d82e309f982..1cbd7d94593 100644
--- a/source4/dns_server/dnsserver_common.c
+++ b/source4/dns_server/dnsserver_common.c
@@ -1034,10 +1034,11 @@ WERROR dns_common_replace(struct ldb_context *samdb,
 			 * record.
 			 */
 			if (records[i].data.EntombedTime != 0) {
-				if (rec_count != 1) {
-					DBG_ERR("tombstone record has %u neighbour "
-						"records.\n",
-						rec_count - 1);
+				if (rec_count != 1 && DEBUGLVL(DBGLVL_NOTICE)) {
+					DBG_NOTICE("tombstone record [%u] has "
+						   "%u neighbour records.\n",
+						   i, rec_count - 1);
+					NDR_PRINT_DEBUG(dnsp_DnssrvRpcRecord, &records[i]);
 				}
 				was_tombstoned = true;
 			}


-- 
Samba Shared Repository