From: Pierangelo Masarati <ando@OpenLDAP.org>
Date: Tue, 8 Jan 2013 16:39:00 +0000 (+0100)
Subject: handle SLAP_MOD_SOFTDEL (ITS#7487) and other internal modification specifiers
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=02f8963f74e55022887e79bddcf94dddac44fd4d;p=openldap

handle SLAP_MOD_SOFTDEL (ITS#7487) and other internal modification specifiers
---

diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c
index 502cb46fc1..84c1457699 100644
--- a/servers/slapd/overlays/memberof.c
+++ b/servers/slapd/overlays/memberof.c
@@ -1420,6 +1420,7 @@ memberof_res_modify( Operation *op, SlapReply *rs )
 
 			switch ( ml->sml_op ) {
 			case LDAP_MOD_DELETE:
+			case SLAP_MOD_SOFTDEL: /* ITS#7487: can be used by syncrepl (in mirror mode?) */
 				vals = ml->sml_nvalues;
 				if ( vals != NULL ) {
 					for ( i = 0; !BER_BVISNULL( &vals[ i ] ); i++ ) {
@@ -1451,6 +1452,8 @@ memberof_res_modify( Operation *op, SlapReply *rs )
 				/* fall thru */
 	
 			case LDAP_MOD_ADD:
+			case SLAP_MOD_SOFTADD: /* ITS#7487 */
+			case SLAP_MOD_ADD_IF_NOT_PRESENT : /* ITS#7487 */
 				assert( ml->sml_nvalues != NULL );
 				vals = ml->sml_nvalues;
 				for ( i = 0; !BER_BVISNULL( &vals[ i ] ); i++ ) {