X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-sql%2Foperational.c;h=e99741a6d9b4ae530e504a5f971f32c889f661cf;hb=910ee45f0188c9b808a508e49af47a8c83e23422;hp=2fc2ac0855b40fa6c20cb4cd75973214e1b883ed;hpb=a6d9e7d933aac7817a45e5affba8fe6d3090e0f7;p=openldap

diff --git a/servers/slapd/back-sql/operational.c b/servers/slapd/back-sql/operational.c
index 2fc2ac0855..e99741a6d9 100644
--- a/servers/slapd/back-sql/operational.c
+++ b/servers/slapd/back-sql/operational.c
@@ -83,7 +83,7 @@ backsql_operational_entryCSN( Operation *op )
 	BER_BVZERO( &a->a_vals[ 1 ] );
 
 #ifdef BACKSQL_SYNCPROV
-	if ( op->o_sync && op->o_tag == LDAP_REQ_SEARCH ) {
+	if ( op->o_sync && op->o_tag == LDAP_REQ_SEARCH && op->o_private != NULL ) {
 		assert( op->o_private != NULL );
 
 		entryCSN = *((struct berval *)op->o_private);
@@ -91,7 +91,9 @@ backsql_operational_entryCSN( Operation *op )
 	} else
 #endif /* BACKSQL_SYNCPROV */
 	{
-		slap_get_csn( op, csnbuf, sizeof(csnbuf), &entryCSN, 0 );
+		entryCSN.bv_val = csnbuf;
+		entryCSN.bv_len = sizeof( csnbuf );
+		slap_get_csn( op, &entryCSN, 0 );
 	}
 
 	ber_dupbv( &a->a_vals[ 0 ], &entryCSN );
@@ -184,7 +186,6 @@ backsql_operational(
 
 		rc = backsql_init_search( &bsi, &rs->sr_entry->e_nname,
 				LDAP_SCOPE_BASE,
-				SLAP_NO_LIMIT, SLAP_NO_LIMIT,
 				(time_t)(-1), NULL, dbh, op, rs, NULL,
 				BACKSQL_ISF_GET_ID );
 		if ( rc != LDAP_SUCCESS ) {