From 3b2e884e9c4b4a1a8b4c73e6af030e862c43d795 Mon Sep 17 00:00:00 2001 From: Ludwig Krispenz Date: Fri, 9 Feb 2018 08:55:40 +0100 Subject: [PATCH] ticket 49551 - additional corrections --- ldap/servers/plugins/replication/urp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ldap/servers/plugins/replication/urp.c b/ldap/servers/plugins/replication/urp.c index be1cd0a..11c5da7 100644 --- a/ldap/servers/plugins/replication/urp.c +++ b/ldap/servers/plugins/replication/urp.c @@ -1922,7 +1922,7 @@ done: newpb = NULL; slapi_log_err(SLAPI_LOG_REPL, sessionid, - "urp_get_min_naming_conflict_entry - Found %d entries\n", i); + "urp_get_min_naming_conflict_entry - Found %d entries\n", min_csn?1:0); return min_naming_conflict_entry; } @@ -2172,8 +2172,8 @@ mod_objectclass_attr(const char *uniqueid, const Slapi_DN *entrysdn, const Slapi char csnstr[CSN_STRSIZE+1] = {0}; slapi_mods_init(&smods, 3); - slapi_mods_add(&smods, LDAP_MOD_ADD, "objectclass", strlen("ldapsubentry"),"ldapsubentry"); - slapi_mods_add(&smods, LDAP_MOD_REPLACE, "conflictcsn", CSN_STRSIZE, csn_as_string(opcsn, PR_FALSE, csnstr)); + slapi_mods_add_string(&smods, LDAP_MOD_ADD, "objectclass", "ldapsubentry"); + slapi_mods_add_string(&smods, LDAP_MOD_REPLACE, "conflictcsn", csn_as_string(opcsn, PR_FALSE, csnstr)); op_result = urp_fixup_modify_entry(uniqueid, entrysdn, opcsn, &smods, 0); slapi_mods_done(&smods); if (op_result == LDAP_TYPE_OR_VALUE_EXISTS) { -- 2.9.5