From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 21 Dec 2005 21:19:51 +0000 (+0000)
Subject: ITS#4146/4266 fixes
X-Git-Tag: OPENLDAP_REL_ENG_2_3_14~19
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0c8a0f1fb624aea0161d48b78da7368032985c8b;p=openldap

ITS#4146/4266 fixes
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 8209e2d91c..355171986f 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -44,6 +44,11 @@ struct nonpresent_entry {
 #define	SYNCLOG_LOGGING		0	/* doing a log-based update */
 #define	SYNCLOG_FALLBACK	1	/* doing a full refresh */
 
+#define RETRYNUM_FOREVER	(-1)	/* retry forever */
+#define RETRYNUM_TAIL		(-2)	/* end of retrynum array */
+#define RETRYNUM_VALID(n)	((n) >= RETRYNUM_FOREVER)	/* valid retrynum */
+#define RETRYNUM_FINITE(n)	((n) > RETRYNUM_FOREVER)	/* not forever */
+
 typedef struct syncinfo_s {
 	struct slap_backend_db *si_be;
 	struct re_s			*si_re;
@@ -1126,20 +1131,20 @@ reload:
 		rtask->interval.tv_sec = si->si_interval;
 		ldap_pvt_runqueue_resched( &slapd_rq, rtask, defer );
 		if ( si->si_retrynum ) {
-			for ( i = 0; si->si_retrynum_init[i] != -2; i++ ) {
+			for ( i = 0; si->si_retrynum_init[i] != RETRYNUM_TAIL; i++ ) {
 				si->si_retrynum[i] = si->si_retrynum_init[i];
 			}
-			si->si_retrynum[i] = -2;
+			si->si_retrynum[i] = RETRYNUM_TAIL;
 		}
 	} else {
 		for ( i = 0; si->si_retrynum && si->si_retrynum[i] <= 0; i++ ) {
-			if ( si->si_retrynum[i] == -1  || si->si_retrynum[i] == -2 )
+			if ( si->si_retrynum[i] == RETRYNUM_FOREVER || si->si_retrynum[i] == RETRYNUM_TAIL )
 				break;
 		}
 
-		if ( !si->si_retrynum || si->si_retrynum[i] == -2 ) {
+		if ( !si->si_retrynum || si->si_retrynum[i] == RETRYNUM_TAIL ) {
 			ldap_pvt_runqueue_remove( &slapd_rq, rtask );
-		} else if ( si->si_retrynum[i] >= -1 ) {
+		} else if ( RETRYNUM_VALID( si->si_retrynum[i] ) ) {
 			if ( si->si_retrynum[i] > 0 )
 				si->si_retrynum[i]--;
 			rtask->interval.tv_sec = si->si_retryinterval[i];
@@ -1660,12 +1665,12 @@ syncrepl_entry(
 	ava.aa_value = *syncUUID;
 	op->ors_filter = &f;
 
-	op->ors_filterstr.bv_len = STRLENOF( "(entryUUID=)" ) + syncUUID->bv_len;
+	op->ors_filterstr.bv_len = STRLENOF( "(entryUUID=)" ) + syncUUID_strrep.bv_len;
 	op->ors_filterstr.bv_val = (char *) slap_sl_malloc(
 		op->ors_filterstr.bv_len + 1, op->o_tmpmemctx ); 
 	AC_MEMCPY( op->ors_filterstr.bv_val, "(entryUUID=", STRLENOF( "(entryUUID=" ) );
 	AC_MEMCPY( &op->ors_filterstr.bv_val[STRLENOF( "(entryUUID=" )],
-		syncUUID->bv_val, syncUUID->bv_len );
+		syncUUID_strrep.bv_val, syncUUID_strrep.bv_len );
 	op->ors_filterstr.bv_val[op->ors_filterstr.bv_len - 1] = ')';
 	op->ors_filterstr.bv_val[op->ors_filterstr.bv_len] = '\0';
 
@@ -2817,8 +2822,8 @@ parse_syncrepl_line(
 				Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
 				return -1;
 			}
-		} else if ( !strncasecmp( c->argv[ i ], ATTRSONLYSTR "=",
-					STRLENOF( ATTRSONLYSTR "=" ) ) )
+		} else if ( !strncasecmp( c->argv[ i ], ATTRSONLYSTR,
+					STRLENOF( ATTRSONLYSTR ) ) )
 		{
 			si->si_attrsonly = 1;
 		} else if ( !strncasecmp( c->argv[ i ], ATTRSSTR "=",
@@ -3001,8 +3006,8 @@ parse_syncrepl_line(
 				}
 				si->si_retryinterval[j] = (time_t)t;
 				if ( *retry_list[j*2+1] == '+' ) {
-					si->si_retrynum_init[j] = -1;
-					si->si_retrynum[j] = -1;
+					si->si_retrynum_init[j] = RETRYNUM_FOREVER;
+					si->si_retrynum[j] = RETRYNUM_FOREVER;
 					j++;
 					break;
 				} else {
@@ -3024,8 +3029,8 @@ parse_syncrepl_line(
 					}
 				}
 			}
-			si->si_retrynum_init[j] = -2;
-			si->si_retrynum[j] = -2;
+			si->si_retrynum_init[j] = RETRYNUM_TAIL;
+			si->si_retrynum[j] = RETRYNUM_TAIL;
 			si->si_retryinterval[j] = 0;
 			
 			for ( k = 0; retry_list && retry_list[k]; k++ ) {
@@ -3213,7 +3218,7 @@ syncrepl_unparse( syncinfo_t *si, struct berval *bv )
 		}
 	}
 	if ( si->si_attrsonly ) {
-		ptr = lutil_strcopy( ptr, " " ATTRSONLYSTR "=yes" );
+		ptr = lutil_strcopy( ptr, " " ATTRSONLYSTR );
 	}
 	if ( si->si_anfile ) {
 		ptr = lutil_strcopy( ptr, " " ATTRSSTR "=:include:" );
@@ -3264,7 +3269,7 @@ syncrepl_unparse( syncinfo_t *si, struct berval *bv )
 			if ( space ) *ptr++ = ' ';
 			space = 1;
 			ptr += sprintf( ptr, "%ld ", (long) si->si_retryinterval[i] );
-			if ( si->si_retrynum_init[i] == -1 )
+			if ( si->si_retrynum_init[i] == RETRYNUM_FOREVER )
 				*ptr++ = '+';
 			else
 				ptr += sprintf( ptr, "%d", si->si_retrynum_init[i] );