[SCM] Samba Shared Repository - branch master updated

[Gary Lockyer]

The branch, master has been updated
       via  063809bc960 dsdb repl_meta_data: Don't print ldif on error
      from  59cca4c5d69 WHATSNEW.txt: change "mangled names" default to "illegal"

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


- Log -----------------------------------------------------------------
commit 063809bc9609fa5d47e548445d3af1495285624e
Author: Gary Lockyer <gary at catalyst.net.nz>
Date:   Mon Jul 8 16:14:26 2019 +1200

    dsdb repl_meta_data: Don't print ldif on error
    
    Don't call ldb_ldif_message_redacted_string when linked_attr_modify
    fails.  When joining a large domain this takes way to much time, in excess of 3
    hours for a join on a 200k domain.
    
    Signed-off-by: Gary Lockyer <gary at catalyst.net.nz>
    Reviewed-by: Tim Beale <timbeale at catalyst.net.nz>
    
    Autobuild-User(master): Gary Lockyer <gary at samba.org>
    Autobuild-Date(master): Tue Jul  9 03:03:25 UTC 2019 on sn-devel-184

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 9dd354743ff..1d800feb0c1 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -8459,12 +8459,11 @@ static int replmd_process_la_group(struct ldb_module *module,
 	ret = linked_attr_modify(module, msg, NULL);
 	if (ret != LDB_SUCCESS) {
 		ldb_debug(ldb, LDB_DEBUG_WARNING,
-			  "Failed to apply linked attribute change '%s'\n%s\n",
+			  "Failed to apply linked attribute change "
+			  "Error: '%s' DN: '%s' Attribute: '%s'\n",
 			  ldb_errstring(ldb),
-			  ldb_ldif_message_redacted_string(ldb,
-							   tmp_ctx,
-							   LDB_CHANGETYPE_MODIFY,
-							   msg));
+			  ldb_dn_get_linearized(msg->dn),
+			  attr->lDAPDisplayName);
 		TALLOC_FREE(tmp_ctx);
 		return ret;
 	}


-- 
Samba Shared Repository