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

[Matthijs Mohlmann]

Author: matthijs
Date: 2007-09-15 11:23:44 +0000 (Sat, 15 Sep 2007)
New Revision: 851

Added:
   openldap/trunk-2.3/debian/patches/ITS5119
Removed:
   openldap/trunk-2.3/debian/patches/ITS4924
   openldap/trunk-2.3/debian/patches/ITS4925
   openldap/trunk-2.3/debian/patches/ITS4966
Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/patches/series
Log:
 * Added patch for 440632, which causes slapd to crash.
 * Removed patches that we got from upstream.


Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2007-09-15 11:07:42 UTC (rev 850)
+++ openldap/trunk-2.3/debian/changelog	2007-09-15 11:23:44 UTC (rev 851)
@@ -8,6 +8,9 @@
 
   [ Matthijs Mohlmann ]
   * Fix bashism in initscript. (Closes: #428883)
+  * Drop upstream patches ITS4924, ITS4925 and ITS4966.
+  * Add patch for objectClasses which causes slapd to crash. (Closes: #440632)
+    - Upstream bug ITS5119.
 
  -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sat, 15 Sep 2007 12:28:43 +0200
 

Deleted: openldap/trunk-2.3/debian/patches/ITS4924
===================================================================
--- openldap/trunk-2.3/debian/patches/ITS4924	2007-09-15 11:07:42 UTC (rev 850)
+++ openldap/trunk-2.3/debian/patches/ITS4924	2007-09-15 11:23:44 UTC (rev 851)
@@ -1,34 +0,0 @@
-A server could crash a client by sending an incorrectly tagged result
-due to an incorrect assert().
-
-ITS#4924
-
---- openldap-2.3.35/libraries/libldap/request.c	2007/01/02 21:43:49	1.103.2.15
-+++ openldap-2.3.35/libraries/libldap/request.c	2007/04/11 07:00:17	1.103.2.16
-@@ -424,7 +424,10 @@ ldap_new_connection( LDAP *ld, LDAPURLDe
- 			++lc->lconn_refcnt;	/* avoid premature free */
- 			ld->ld_defconn = lc;
- 
--			Debug( LDAP_DEBUG_TRACE, "anonymous rebind via ldap_bind_s\n", 0, 0, 0);
-+			Debug( LDAP_DEBUG_TRACE,
-+				"anonymous rebind via ldap_sasl_bind(\"\")\n",
-+				0, 0, 0);
-+
- #ifdef LDAP_R_COMPILE
- 			ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
- 			ldap_pvt_thread_mutex_unlock( &ld->ld_res_mutex );
-@@ -462,7 +465,13 @@ ldap_new_connection( LDAP *ld, LDAPURLDe
- 						break;
- 
- 					default:
--						assert( 0 );
-+						Debug( LDAP_DEBUG_TRACE,
-+							"ldap_new_connection %p: "
-+							"unexpected response %d "
-+							"from BIND request id=%d\n",
-+							ld, ldap_msgtype( res ), msgid );
-+						err = -1;
-+						break;
- 					}
- 				}
- 			}

Deleted: openldap/trunk-2.3/debian/patches/ITS4925
===================================================================
--- openldap/trunk-2.3/debian/patches/ITS4925	2007-09-15 11:07:42 UTC (rev 850)
+++ openldap/trunk-2.3/debian/patches/ITS4925	2007-09-15 11:23:44 UTC (rev 851)
@@ -1,16 +0,0 @@
-Trying a modify operation with the NOOP control set on an entry stored
-in a BDB backend crashed slapd.
-
-ITS#4925
-
---- openldap-2.3.35/servers/slapd/back-bdb/modify.c	2007/01/02 21:44:00	1.124.2.16
-+++ openldap-2.3.35/servers/slapd/back-bdb/modify.c	2007/04/11 18:32:24	1.124.2.17
-@@ -538,6 +538,8 @@ retry:	/* transaction retry */
- 		} else {
- 			rs->sr_err = LDAP_X_NO_OPERATION;
- 			ltid = NULL;
-+			/* Only free attrs if they were dup'd.  */
-+			if ( dummy.e_attrs == e->e_attrs ) dummy.e_attrs = NULL;
- 			goto return_results;
- 		}
- 	} else {

Deleted: openldap/trunk-2.3/debian/patches/ITS4966
===================================================================
--- openldap/trunk-2.3/debian/patches/ITS4966	2007-09-15 11:07:42 UTC (rev 850)
+++ openldap/trunk-2.3/debian/patches/ITS4966	2007-09-15 11:23:44 UTC (rev 851)
@@ -1,18 +0,0 @@
-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;
- 		}

Added: openldap/trunk-2.3/debian/patches/ITS5119
===================================================================
--- openldap/trunk-2.3/debian/patches/ITS5119	                        (rev 0)
+++ openldap/trunk-2.3/debian/patches/ITS5119	2007-09-15 11:23:44 UTC (rev 851)
@@ -0,0 +1,12 @@
+Index: servers/slapd/modify.c
+===================================================================
+--- servers/slapd/modify.c.orig
++++ servers/slapd/modify.c
+@@ -734,6 +734,7 @@
+ 							"%s: value #%ld normalization failed",
+ 							ml->sml_type.bv_val, (long) nvals );
+ 						*text = textbuf;
++                        BER_BVZERO( &ml->sml_nvalues[nvals] );
+ 						return rc;
+ 					}
+ 				}

Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series	2007-09-15 11:07:42 UTC (rev 850)
+++ openldap/trunk-2.3/debian/patches/series	2007-09-15 11:23:44 UTC (rev 851)
@@ -10,6 +10,4 @@
 index-files-created-as-root -p0
 sasl-default-path -p0
 man-slurpd -p0
-ITS4924
-ITS4925
-ITS4966
+ITS5119 -p0