[Pkg-openldap-devel] r806 - in openldap/trunk-2.3/debian: . patches

[Russ Allbery]

Author: rra
Date: 2007-05-30 02:45:57 +0000 (Wed, 30 May 2007)
New Revision: 806

Added:
   openldap/trunk-2.3/debian/patches/ITS4966
Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/patches/series
Log:
  - ITS#4966: Delete of valsort-controlled entries crashed slapd.

Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2007-05-23 22:47:09 UTC (rev 805)
+++ openldap/trunk-2.3/debian/changelog	2007-05-30 02:45:57 UTC (rev 806)
@@ -4,13 +4,14 @@
   * Apply upstream patches:
     - ITS#4924: client crash on incorrectly tagged result from server.
     - ITS#4925: NOOP modify with BDB backend crashed slapd.
+    - ITS#4966: Delete of valsort-controlled entries crashed slapd.
   * Re-enable use of the epoll system call since Debian no longer supports
     2.4 kernels.  This means that the OpenLDAP packages will not work on
     pre-2.6 kernels.
   * Added commentary and upstream ITS numbers for several patches
     applicable upstream.
 
- -- Russ Allbery <rra at debian.org>  Wed, 23 May 2007 15:46:55 -0700
+ -- Russ Allbery <rra at debian.org>  Tue, 29 May 2007 19:45:44 -0700
 
 openldap2.3 (2.3.30-5) unstable; urgency=low
 

Added: openldap/trunk-2.3/debian/patches/ITS4966
===================================================================
--- openldap/trunk-2.3/debian/patches/ITS4966	                        (rev 0)
+++ openldap/trunk-2.3/debian/patches/ITS4966	2007-05-30 02:45:57 UTC (rev 806)
@@ -0,0 +1,18 @@
+Index: openldap-2.3.35/servers/slapd/overlays/valsort.c
+===================================================================
+RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/overlays/valsort.c,v
+retrieving revision 1.19
+retrieving revision 1.20
+diff -u -p -r1.19 -r1.20
+--- openldap-2.3.35/servers/slapd/overlays/valsort.c	20 Apr 2007 20:32:58 -0000	1.19
++++ openldap-2.3.35/servers/slapd/overlays/valsort.c	24 May 2007 22:58:59 -0000	1.20
+@@ -447,6 +447,9 @@ valsort_modify( Operation *op, SlapReply
+ 		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;
+ 		}

Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series	2007-05-23 22:47:09 UTC (rev 805)
+++ openldap/trunk-2.3/debian/patches/series	2007-05-30 02:45:57 UTC (rev 806)
@@ -14,3 +14,4 @@
 man-slurpd -p0
 ITS4924
 ITS4925
+ITS4966