From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 8 Dec 2009 19:36:10 +0000 (+0000)
Subject: guard against simultaneous REP_ENTRY_MUSTRELEASE and REP_ENTRY_MODIFIABLE (ITS#6423)
X-Git-Tag: ACLCHECK_0~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=173873172cd09650d7e9c1019a074ba3faeca7e2;p=openldap

guard against simultaneous REP_ENTRY_MUSTRELEASE and REP_ENTRY_MODIFIABLE (ITS#6423)
---

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index 09675bb004..87dd627836 100644
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -1505,6 +1505,13 @@ rwm_send_entry( Operation *op, SlapReply *rs )
 	(void)rwm_attrs( op, rs, &e->e_attrs, 1 );
 
 	if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) {
+		/* ITS#6423: REP_ENTRY_MUSTRELEASE incompatible
+		 * with REP_ENTRY_MODIFIABLE */
+		if ( rs->sr_entry == e ) {
+			rc = 1;
+			goto fail;
+		}
+
 		overlay_entry_release_ov( op, rs->sr_entry, 0, on );
 	}