From: Howard Chu <hyc@openldap.org>
Date: Fri, 25 May 2007 00:58:59 +0000 (+0000)
Subject: ITS#4966 valsort_modify: ignore Delete modops with no values
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~442
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6186117f9743a674f8f91b96bfd3a266b039ee1c;p=openldap

ITS#4966 valsort_modify: ignore Delete modops with no values
---

diff --git a/servers/slapd/overlays/valsort.c b/servers/slapd/overlays/valsort.c
index f1b82e917c..c7a7dfa5d5 100644
--- a/servers/slapd/overlays/valsort.c
+++ b/servers/slapd/overlays/valsort.c
@@ -447,6 +447,9 @@ valsort_modify( Operation *op, SlapReply *rs )
 		if ( !(vi->vi_sort & VALSORT_WEIGHTED ))
 			continue;
 		for (ml = op->orm_modlist; ml; ml=ml->sml_next ) {
+			/* Must be a Delete Attr op, so no values to consider */
+			if ( !ml->sml_values )
+				continue;
 			if ( ml->sml_desc == vi->vi_ad )
 				break;
 		}