mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

patch for ITS#3379

Browse Source
This commit is contained in:
Jong Hyuk Choi 2004-10-28 21:40:42 +00:00
parent 5704a2ef6e
commit 42f8426b5b
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/slapd/slap.h
View File

@ -1449,6 +1449,8 @@ typedef struct syncinfo_s {
int si_slimit; int si_slimit;
int si_tlimit; int si_tlimit;
struct berval si_syncUUID_ndn; struct berval si_syncUUID_ndn;
int si_refreshDelete;
int si_refreshPresent;
Avlnode *si_presentlist; Avlnode *si_presentlist;
LDAP *si_ld; LDAP *si_ld;
LDAP_LIST_HEAD(np, nonpresent_entry) si_nonpresentlist; LDAP_LIST_HEAD(np, nonpresent_entry) si_nonpresentlist;

17
servers/slapd/syncrepl.c
View File

@ -48,9 +48,6 @@ static int dn_callback( struct slap_op *, struct slap_rep * );
static int nonpresent_callback( struct slap_op *, struct slap_rep * ); static int nonpresent_callback( struct slap_op *, struct slap_rep * );
static int null_callback( struct slap_op *, struct slap_rep * ); static int null_callback( struct slap_op *, struct slap_rep * );
static int si_refreshDelete = 0;
static int si_refreshPresent = 0;
static AttributeDescription *sync_descs[4]; static AttributeDescription *sync_descs[4];
struct runqueue_s syncrepl_rq; struct runqueue_s syncrepl_rq;
@ -724,7 +721,7 @@ do_syncrep2(
"do_syncrep2: %s - %s%s\n", "do_syncrep2: %s - %s%s\n",
"LDAP_RES_INTERMEDIATE", "LDAP_RES_INTERMEDIATE",
"REFRESH_DELETE\n", "\n" ); "REFRESH_DELETE\n", "\n" );
si_refreshDelete = 1; si->si_refreshDelete = 1;
case LDAP_TAG_SYNC_REFRESH_PRESENT: case LDAP_TAG_SYNC_REFRESH_PRESENT:
Debug( LDAP_DEBUG_SYNC, Debug( LDAP_DEBUG_SYNC,
"do_syncrep2: %s - %s%s\n", "do_syncrep2: %s - %s%s\n",
@ -732,8 +729,8 @@ do_syncrep2(
si_tag == LDAP_TAG_SYNC_REFRESH_PRESENT ? si_tag == LDAP_TAG_SYNC_REFRESH_PRESENT ?
"REFRESH_PRESENT" : "REFRESH_DELETE", "REFRESH_PRESENT" : "REFRESH_DELETE",
"\n" ); "\n" );
si_refreshDelete = 1; si->si_refreshDelete = 1;
si_refreshPresent = 1; si->si_refreshPresent = 1;
ber_scanf( ber, "t{" /*"}"*/, &tag ); ber_scanf( ber, "t{" /*"}"*/, &tag );
if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE ) if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE )
{ {
@ -824,7 +821,7 @@ do_syncrep2(
syncrepl_updateCookie( si, op, psub, &syncCookie); syncrepl_updateCookie( si, op, psub, &syncCookie);
} }
if ( si_refreshPresent == 1 ) { if ( si->si_refreshPresent == 1 ) {
if ( match < 0 ) { if ( match < 0 ) {
syncrepl_del_nonpresent( op, si ); syncrepl_del_nonpresent( op, si );
} }
@ -942,8 +939,8 @@ do_syncrepl(
/* Establish session, do search */ /* Establish session, do search */
if ( !si->si_ld ) { if ( !si->si_ld ) {
first = 1; first = 1;
si_refreshDelete = 0; si->si_refreshDelete = 0;
si_refreshPresent = 0; si->si_refreshPresent = 0;
rc = do_syncrep1( &op, si ); rc = do_syncrep1( &op, si );
} }
@ -1223,7 +1220,7 @@ syncrepl_entry(
} }
if (( syncstate == LDAP_SYNC_PRESENT || syncstate == LDAP_SYNC_ADD )) { if (( syncstate == LDAP_SYNC_PRESENT || syncstate == LDAP_SYNC_ADD )) {
if ( !si_refreshPresent ) { if ( !si->si_refreshPresent ) {
syncuuid_bv = ber_dupbv( NULL, syncUUID ); syncuuid_bv = ber_dupbv( NULL, syncUUID );
avl_insert( &si->si_presentlist, (caddr_t) syncuuid_bv, avl_insert( &si->si_presentlist, (caddr_t) syncuuid_bv,
syncuuid_cmp, avl_dup_error ); syncuuid_cmp, avl_dup_error );