From: Jong Hyuk Choi <jongchoi@openldap.org>
Date: Thu, 13 Nov 2003 00:11:44 +0000 (+0000)
Subject: fix for the cascading replication (reenabling test019)
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~452
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=64dd6a07606ae45e80742f77e6273eb6abd14cd1;p=openldap

fix for the cascading replication (reenabling test019)
---

diff --git a/include/ldap.h b/include/ldap.h
index 6fa49e4121..cf96aa7f98 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -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
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index ff38a90c62..92d51347ec 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -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 )
diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade
index a1310a8ceb..2a92834d68 100755
--- a/tests/scripts/test019-syncreplication-cascade
+++ b/tests/scripts/test019-syncreplication-cascade
@@ -1,9 +1,6 @@
 #! /bin/sh
 # $OpenLDAP$
 
-echo "temporarily disabled"
-exit 0
-
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh