From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 10 Nov 2008 19:43:34 +0000 (+0000)
Subject: ITS#5760
X-Git-Tag: OPENLDAP_REL_ENG_2_4_13~93
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cf290bfcce970ce250d5fb250b955777d25dc11e;p=openldap

ITS#5760
---

diff --git a/CHANGES b/CHANGES
index de07f3baa7..55579a004a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,7 @@ OpenLDAP 2.4.13 Engineering
 	Added slapo-constraint support for relax control (ITS#5705)
 	Added slapo-constraint "set" type (ITS#5702)
 	Fixed slapo-constraint filter parsing error (ITS#5751)
+	Fixed slapo-rwm objectClass preservation (ITS#5760)
 	Fixed slapo-rwm rewriting undefined filter (ITS#5731)
 	Fixed slapo-rwm reusing freed filter (ITS#5732)
 	Added slapo-translucent try local bind when remote fails (ITS#5656)
diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index f9301ccf9f..1c8e704751 100644
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -1177,7 +1177,9 @@ remove_oc:;
 					last--;
 					bv--;
 
-				} else if ( mapped.bv_val != bv[0].bv_val ) {
+				} else if ( mapped.bv_val != bv[0].bv_val
+					&& ber_bvstrcasecmp( &mapped, &bv[0] ) != 0 )
+				{
 					int	i;
 
 					for ( i = 0; !BER_BVISNULL( &(*ap)->a_vals[ i ] ); i++ ) {