From cf290bfcce970ce250d5fb250b955777d25dc11e Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 10 Nov 2008 19:43:34 +0000 Subject: [PATCH] ITS#5760 --- CHANGES | 1 + servers/slapd/overlays/rwm.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) 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++ ) { -- 2.39.2