From 62fbb3423b26426e735e134134ab710945514ca6 Mon Sep 17 00:00:00 2001 From: Ludwig Krispenz Date: Tue, 26 Sep 2017 15:51:41 +0200 Subject: [PATCH] Ticket: 49180 - errors log filled with attrlist_replace - attr_replace Bug: If a RUV contains the same URL with different replica IDs the created referrals contain duplicates Fix: check duplicate referrals Reviewed by: Mark, thanks --- ldap/servers/plugins/replication/repl5_ruv.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ldap/servers/plugins/replication/repl5_ruv.c b/ldap/servers/plugins/replication/repl5_ruv.c index 40dc0928b..7bfdc3425 100644 --- a/ldap/servers/plugins/replication/repl5_ruv.c +++ b/ldap/servers/plugins/replication/repl5_ruv.c @@ -1386,7 +1386,17 @@ ruv_replica_count(const RUV *ruv) * Extract all the referral URL's from the RUV (but self URL), * returning them in an array of strings, that * the caller must free. + * We also check and remove duplicates (caused by unclean RUVs) */ +static int +ruv_referral_exists(unsigned char *purl, char **refs, int count) +{ + for (size_t j=0; jreplica_purl != NULL) && (slapi_utf8casecmp((unsigned char *)replica->replica_purl, - (unsigned char *)mypurl) != 0)) { + (unsigned char *)mypurl) != 0) && + !ruv_referral_exists((unsigned char *)replica->replica_purl, r, i)) { r[i] = slapi_ch_strdup(replica->replica_purl); i++; } -- 2.13.6