From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Sat, 5 Nov 2011 00:19:20 +0000 (-0700)
Subject: Missed portion of 04f8fa5619fed389f238d780129d535a0947ee6f
X-Git-Tag: OPENLDAP_REL_ENG_2_4_27~83
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a6cb0cfece538e564fb97f2ec7dee9298d575531;p=openldap

Missed portion of 04f8fa5619fed389f238d780129d535a0947ee6f
---

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index c724be2b9d..cf8b1da67f 100644
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -911,6 +911,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 );
 		if ( rc == SLAP_CB_CONTINUE ) {
 			*ep = rs.sr_entry;
 			rc = LDAP_SUCCESS;
@@ -1498,6 +1499,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 );
 		rc = 1;
 		goto fail;
 	}