From d1fc697830166dcbd946d3345e850e697d5a4408 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 21 Dec 2005 21:26:27 +0000
Subject: [PATCH] sync to rev 1.238

---
 servers/slapd/syncrepl.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 355171986f..04e1010ef2 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -3011,7 +3011,9 @@ parse_syncrepl_line(
 					j++;
 					break;
 				} else {
-					if ( lutil_atoi( &si->si_retrynum_init[j], retry_list[j*2+1] ) != 0 ) {
+					if ( lutil_atoi( &si->si_retrynum_init[j], retry_list[j*2+1] ) != 0
+							|| si->si_retrynum_init[j] <= 0 )
+					{
 						snprintf( c->msg, sizeof( c->msg ),
 							"Error: invalid initial retry number \"%s\" (#%d)",
 							retry_list[j*2+1], j );
@@ -3019,7 +3021,9 @@ parse_syncrepl_line(
 						/* do some cleanup */
 						return 1;
 					}
-					if ( lutil_atoi( &si->si_retrynum[j], retry_list[j*2+1] ) != 0 ) {
+					if ( lutil_atoi( &si->si_retrynum[j], retry_list[j*2+1] ) != 0
+							|| si->si_retrynum[j] <= 0 )
+					{
 						snprintf( c->msg, sizeof( c->msg ),
 							"Error: invalid retry number \"%s\" (#%d)",
 							retry_list[j*2+1], j );
@@ -3054,7 +3058,10 @@ parse_syncrepl_line(
 					STRLENOF( SLIMITSTR "=") ) )
 		{
 			val = c->argv[ i ] + STRLENOF( SLIMITSTR "=" );
-			if ( lutil_atoi( &si->si_slimit, val ) != 0 ) {
+			if ( strcasecmp( val, "unlimited" ) == 0 ) {
+				si->si_slimit = 0;
+
+			} else if ( lutil_atoi( &si->si_slimit, val ) != 0 || val < 0 ) {
 				snprintf( c->msg, sizeof( c->msg ),
 					"invalid size limit value \"%s\".\n",
 					val );
@@ -3065,7 +3072,10 @@ parse_syncrepl_line(
 					STRLENOF( TLIMITSTR "=" ) ) )
 		{
 			val = c->argv[ i ] + STRLENOF( TLIMITSTR "=" );
-			if ( lutil_atoi( &si->si_tlimit, val ) != 0 ) {
+			if ( strcasecmp( val, "unlimited" ) == 0 ) {
+				si->si_tlimit = 0;
+
+			} else if ( lutil_atoi( &si->si_tlimit, val ) != 0 || val < 0 ) {
 				snprintf( c->msg, sizeof( c->msg ),
 					"invalid time limit value \"%s\".\n",
 					val );
@@ -3177,6 +3187,8 @@ syncrepl_unparse( syncinfo_t *si, struct berval *bv )
 	char buf[BUFSIZ*2], *ptr;
 	int i;
 
+	/* FIXME: we're not checking for buf[] overflow! */
+
 	/* temporarily inhibit bindconf from printing URI */
 	uri = si->si_bindconf.sb_uri;
 	BER_BVZERO( &si->si_bindconf.sb_uri );
-- 
2.39.5