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

fix for the cascading replication (reenabling test019)

Browse Source
This commit is contained in:
Jong Hyuk Choi 2003-11-13 00:11:44 +00:00
parent 0db0d4e005
commit 64dd6a0760
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ldap.h
View File

@ -219,10 +219,6 @@ typedef struct ldapcontrol {
#define LDAP_TAG_REFRESHDONE ((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_ADD 1
#define LDAP_SYNC_MODIFY 2

20
servers/slapd/syncrepl.c
View File

@ -571,7 +571,15 @@ do_syncrep2(
ber_scanf( ber, "t{", &tag );
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 ) ==
LDAP_TAG_REFRESHDONE )
@ -585,7 +593,15 @@ do_syncrep2(
ber_scanf( ber, "t{", &tag );
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 ) ==
LDAP_TAG_REFRESHDELETES )

3
tests/scripts/test019-syncreplication-cascade
View File

@ -1,9 +1,6 @@
#! /bin/sh
# $OpenLDAP$
echo "temporarily disabled"
exit 0
echo "running defines.sh"
. $SRCDIR/scripts/defines.sh