Commit 64dd6a07 authored by Jong Hyuk Choi's avatar Jong Hyuk Choi
Browse files

fix for the cascading replication (reenabling test019)

parent 0db0d4e0
...@@ -219,10 +219,6 @@ typedef struct ldapcontrol { ...@@ -219,10 +219,6 @@ typedef struct ldapcontrol {
#define LDAP_TAG_REFRESHDONE ((ber_tag_t) 0x01U) #define LDAP_TAG_REFRESHDONE ((ber_tag_t) 0x01U)
#define LDAP_TAG_RELOAD_HINT ((ber_tag_t) 0x01U) #define LDAP_TAG_RELOAD_HINT ((ber_tag_t) 0x01U)
#define LDAP_SYNC_STATE_MODE 0
#define LDAP_SYNC_LOG_MODE 1
#define LDAP_SYNC_PERSIST_MODE 2
#define LDAP_SYNC_PRESENT 0 #define LDAP_SYNC_PRESENT 0
#define LDAP_SYNC_ADD 1 #define LDAP_SYNC_ADD 1
#define LDAP_SYNC_MODIFY 2 #define LDAP_SYNC_MODIFY 2
......
...@@ -571,7 +571,15 @@ do_syncrep2( ...@@ -571,7 +571,15 @@ do_syncrep2(
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 )
{ {
ber_scanf( ber, "m", &tag, &cookie ); ber_scanf( ber, "m", &cookie );
if ( cookie.bv_val ) {
struct berval tmp_bv;
ber_dupbv( &tmp_bv, &cookie );
ber_bvarray_add( &syncCookie.octet_str, &tmp_bv);
}
if ( syncCookie.octet_str &&
syncCookie.octet_str[0].bv_val )
slap_parse_sync_cookie( &syncCookie );
} }
if ( ber_peek_tag( ber, &len ) == if ( ber_peek_tag( ber, &len ) ==
LDAP_TAG_REFRESHDONE ) LDAP_TAG_REFRESHDONE )
...@@ -585,7 +593,15 @@ do_syncrep2( ...@@ -585,7 +593,15 @@ do_syncrep2(
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 )
{ {
ber_scanf( ber, "m", &tag, &cookie ); ber_scanf( ber, "m", &cookie );
if ( cookie.bv_val ) {
struct berval tmp_bv;
ber_dupbv( &tmp_bv, &cookie );
ber_bvarray_add( &syncCookie.octet_str, &tmp_bv);
}
if ( syncCookie.octet_str &&
syncCookie.octet_str[0].bv_val )
slap_parse_sync_cookie( &syncCookie );
} }
if ( ber_peek_tag( ber, &len ) == if ( ber_peek_tag( ber, &len ) ==
LDAP_TAG_REFRESHDELETES ) LDAP_TAG_REFRESHDELETES )
......
#! /bin/sh #! /bin/sh
# $OpenLDAP$ # $OpenLDAP$
echo "temporarily disabled"
exit 0
echo "running defines.sh" echo "running defines.sh"
. $SRCDIR/scripts/defines.sh . $SRCDIR/scripts/defines.sh
......
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