Commit 9dd2d1d1 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5597

parent 95d4d41e
...@@ -13,7 +13,8 @@ OpenLDAP 2.4.11 Engineering ...@@ -13,7 +13,8 @@ OpenLDAP 2.4.11 Engineering
Fixed slapd equality rules for olcRootDN/olcSchemaDN (ITS#5540) Fixed slapd equality rules for olcRootDN/olcSchemaDN (ITS#5540)
Fixed slapd sets memory leak (ITS#5557) Fixed slapd sets memory leak (ITS#5557)
Fixed slapd sortvals binary search (ITS#5578) Fixed slapd sortvals binary search (ITS#5578)
Fixed slapd/slapo-syncprov syncrepl contextCSN updates as internal ops (ITS#5596) Fixed slapd syncrepl updates with multiple masters (ITS#5597)
Fixed slapd syncrepl/slapo-syncprov contextCSN updates as internal ops (ITS#5596)
Fixed slapd-meta link to slapd-ldap (ITS#5355) Fixed slapd-meta link to slapd-ldap (ITS#5355)
Fixed slapd-sock, back-shell buffer count (ITS#5558) Fixed slapd-sock, back-shell buffer count (ITS#5558)
Fixed slapo-dynlist dg attrs lookup (ITS#5583) Fixed slapo-dynlist dg attrs lookup (ITS#5583)
......
...@@ -689,8 +689,8 @@ compare_csns( struct sync_cookie *sc1, struct sync_cookie *sc2, int *which ) ...@@ -689,8 +689,8 @@ compare_csns( struct sync_cookie *sc1, struct sync_cookie *sc2, int *which )
return -1; return -1;
} }
for (i=0; i<sc1->numcsns; i++) { for (j=0; j<sc2->numcsns; j++) {
for (j=0; j<sc2->numcsns; j++) { for (i=0; i<sc1->numcsns; i++) {
if ( sc1->sids[i] != sc2->sids[j] ) if ( sc1->sids[i] != sc2->sids[j] )
continue; continue;
value_match( &match, slap_schema.si_ad_entryCSN, value_match( &match, slap_schema.si_ad_entryCSN,
...@@ -703,6 +703,11 @@ compare_csns( struct sync_cookie *sc1, struct sync_cookie *sc2, int *which ) ...@@ -703,6 +703,11 @@ compare_csns( struct sync_cookie *sc1, struct sync_cookie *sc2, int *which )
} }
break; break;
} }
if ( i == sc1->numcsns ) {
/* sc2 has a sid sc1 lacks */
*which = j;
return -1;
}
} }
return match; return match;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment