From 7222ee0a245d340b526b8220d53c9ffd8c0c4dfa Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Sat, 26 Jan 2013 01:53:41 -0800 Subject: [PATCH] replmetadata: raise msg level for conflict resolution so that we don't polute logs Reviewed-by: Andrew Bartlett --- source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 30b2a42d13..651cdf1c04 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -3544,7 +3544,7 @@ static int replmd_op_possible_conflict_callback(struct ldb_request *req, struct goto failed; } - DEBUG(1,(__location__ ": Resolving conflict record via incoming rename '%s' -> '%s'\n", + DEBUG(2,(__location__ ": Resolving conflict record via incoming rename '%s' -> '%s'\n", ldb_dn_get_linearized(conflict_dn), ldb_dn_get_linearized(new_dn))); /* re-submit the request, but with a different @@ -3579,7 +3579,7 @@ static int replmd_op_possible_conflict_callback(struct ldb_request *req, struct goto failed; } - DEBUG(1,(__location__ ": Resolving conflict record via existing rename '%s' -> '%s'\n", + DEBUG(2,(__location__ ": Resolving conflict record via existing rename '%s' -> '%s'\n", ldb_dn_get_linearized(conflict_dn), ldb_dn_get_linearized(new_dn))); ret = dsdb_module_rename(ar->module, conflict_dn, new_dn, -- 2.34.1