From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 6 Jan 2011 23:43:24 +0000 (+0000)
Subject: Fix for RE24 code base
X-Git-Tag: OPENLDAP_REL_ENG_2_4_24~84
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e48b66231c52fc040fe59b1cf0d3facbc749f346;p=openldap

Fix for RE24 code base
---

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index c7e277b4aa..2122a31c6a 100644
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -916,7 +916,7 @@ rwm_entry_get_rw( Operation *op, struct berval *ndn,
 		/* duplicate & release */
 		op2.o_bd->bd_info = (BackendInfo *)on;
 		rc = rwm_send_entry( &op2, &rs );
-		RS_ASSERT( rs.sr_flags & REP_ENTRY_MUSTFLUSH );
+		assert( rs.sr_flags & REP_ENTRY_MUSTFLUSH );
 		if ( rc == SLAP_CB_CONTINUE ) {
 			*ep = rs.sr_entry;
 			rc = LDAP_SUCCESS;
@@ -1508,7 +1508,7 @@ rwm_send_entry( Operation *op, SlapReply *rs )
 	} else if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) {
 		/* ITS#6423: REP_ENTRY_MUSTRELEASE incompatible
 		 * with REP_ENTRY_MODIFIABLE */
-		RS_ASSERT( 0 );
+		assert( 0 );
 		rc = 1;
 		goto fail;
 	}