mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix prev commit, syncrepl_add_glue must start from sufix

Browse Source
This commit is contained in:
Howard Chu 2003-10-19 08:57:30 +00:00
parent d33e095799
commit 91ebcd87bd
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
servers/slapd/syncrepl.c
View File

@ -1109,15 +1109,13 @@ syncrepl_add_glue(
ptr++;
i++;
}
suffrdns = i+1;
suffrdns = i;
} else {
/* suffix is "" */
suffrdns = 0;
}
/* advance to first child: count RDN separators since the prettyDNs
* may not be exactly the same length
*/
/* Start with BE suffix */
for ( i = 0, ptr = NULL; i < suffrdns; i++ ) {
comma = strrchr(dn.bv_val, ',');
if ( ptr ) *ptr = ',';
@ -1133,12 +1131,8 @@ syncrepl_add_glue(
* required.
*/
if ( ndn.bv_len > be->be_nsuffix[0].bv_len ) {
comma = ndn.bv_val + ndn.bv_len - be->be_nsuffix[0].bv_len - 1;
*comma = '\0';
ptr = strrchr( ndn.bv_val, ',' ) + 1;
*comma = ',';
ndn.bv_len -= ptr - ndn.bv_val;
ndn.bv_val = ptr;
ndn.bv_val += ndn.bv_len - be->be_nsuffix[0].bv_len;
ndn.bv_len = be->be_nsuffix[0].bv_len;
}
while ( ndn.bv_val > e->e_nname.bv_val ) {
@ -1187,10 +1181,10 @@ syncrepl_add_glue(
/* Move to next child */
for (ptr = dn.bv_val-2; ptr > e->e_name.bv_val && *ptr != ','; ptr--);
if ( ptr == e->e_name.bv_val ) break;
dn.bv_val = ptr+1;
dn.bv_val = ++ptr;
dn.bv_len = e->e_name.bv_len - (ptr-e->e_name.bv_val);
for (ptr = ndn.bv_val-2; ptr > e->e_nname.bv_val && *ptr != ','; ptr--);
ndn.bv_val = ptr+1;
ndn.bv_val = ++ptr;
ndn.bv_len = e->e_nname.bv_len - (ptr-e->e_nname.bv_val);
}