mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-12 10:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#7427 fix for spurious old entries

Browse Source
This commit is contained in:
Howard Chu 2012-11-01 08:36:28 -07:00
parent 64b164b4fc
commit 951418f0bf
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servers/slapd/syncrepl.c
View File

@ -112,6 +112,7 @@ typedef struct syncinfo_s {
int si_logstate;
int si_got;
int si_strict_refresh; /* stop listening during fallback refresh */
int si_too_old;
ber_int_t si_msgid;
Avlnode *si_presentlist;
LDAP *si_ld;
@ -935,8 +936,10 @@ do_syncrep2(
si->si_ridtxt, syncCookie.ctxcsn->bv_val, bdn.bv_val );
ldap_controls_free( rctrls );
rc = 0;
si->si_too_old = 1;
goto done;
}
si->si_too_old = 0;
break;
}
}
@ -976,6 +979,13 @@ do_syncrep2(
}
assert( punlock < 0 );
punlock = i;
} else if (si->si_too_old) {
bdn.bv_val[bdn.bv_len] = '\0';
Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s CSN too old, ignoring (%s)\n",
si->si_ridtxt, bdn.bv_val, 0 );
ldap_controls_free( rctrls );
rc = 0;
goto done;
}
op->o_controls[slap_cids.sc_LDAPsync] = &syncCookie;
}
@ -1426,6 +1436,8 @@ do_syncrepl(
ldap_pvt_thread_yield();
}
si->si_too_old = 0;
if ( si->si_ctype < 1 ) {
goto deleted;
}