[Pkg-openldap-devel] r745 - openldap/trunk-2.3/debian/patches

[Matthijs Mohlmann]

Author: matthijs
Date: 2006-11-10 22:44:41 +0100 (Fri, 10 Nov 2006)
New Revision: 745

Removed:
   openldap/trunk-2.3/debian/patches/CVE-2006-5779
Modified:
   openldap/trunk-2.3/debian/patches/series
Log:
 * Removed patch, fixed in new upstream release.


Deleted: openldap/trunk-2.3/debian/patches/CVE-2006-5779
===================================================================
--- openldap/trunk-2.3/debian/patches/CVE-2006-5779	2006-11-10 21:38:04 UTC (rev 744)
+++ openldap/trunk-2.3/debian/patches/CVE-2006-5779	2006-11-10 21:44:41 UTC (rev 745)
@@ -1,46 +0,0 @@
-Index: libraries/libldap/getdn.c
-===================================================================
---- libraries/libldap/getdn.c.orig
-+++ libraries/libldap/getdn.c
-@@ -2025,7 +2025,7 @@
- strval2strlen( struct berval *val, unsigned flags, ber_len_t *len )
- {
- 	ber_len_t	l, cl = 1;
--	char		*p;
-+	char		*p, *end;
- 	int		escaped_byte_len = LDAP_DN_IS_PRETTY( flags ) ? 1 : 3;
- #ifdef PRETTY_ESCAPE
- 	int		escaped_ascii_len = LDAP_DN_IS_PRETTY( flags ) ? 2 : 3;
-@@ -2039,7 +2039,8 @@
- 		return( 0 );
- 	}
- 
--	for ( l = 0, p = val->bv_val; p < val->bv_val + val->bv_len; p += cl ) {
-+    end = val->bv_val + val->bv_len - 1;
-+    for ( l = 0, p = val->bv_val; p <= end; p += cl ) {
- 
- 		/* 
- 		 * escape '%x00' 
-@@ -2068,7 +2069,7 @@
- 		} else if ( LDAP_DN_NEEDESCAPE( p[ 0 ] )
- 				|| LDAP_DN_SHOULDESCAPE( p[ 0 ] )
- 				|| ( p == val->bv_val && LDAP_DN_NEEDESCAPE_LEAD( p[ 0 ] ) )
--				|| ( !p[ 1 ] && LDAP_DN_NEEDESCAPE_TRAIL( p[ 0 ] ) ) ) {
-+                || ( p == end && LDAP_DN_NEEDESCAPE_TRAIL( p[ 0 ] ) ) ) {
- #ifdef PRETTY_ESCAPE
- #if 0
- 			if ( LDAP_DN_WILLESCAPE_HEX( flags, p[ 0 ] ) ) {
-Index: servers/slapd/connection.c
-===================================================================
---- servers/slapd/connection.c.orig
-+++ servers/slapd/connection.c
-@@ -2008,7 +2008,8 @@
- 	op->o_callback = cb->sc_next;
- 
- 	ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
--	op->o_conn->c_conn_state = SLAP_C_ACTIVE;
-+    if ( op->o_conn->c_conn_state == SLAP_C_BINDING )
-+        op->o_conn->c_conn_state = SLAP_C_ACTIVE;
- 	op->o_conn->c_sasl_bind_in_progress =
- 		( rs->sr_err == LDAP_SASL_BIND_IN_PROGRESS );
- 

Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series	2006-11-10 21:38:04 UTC (rev 744)
+++ openldap/trunk-2.3/debian/patches/series	2006-11-10 21:44:41 UTC (rev 745)
@@ -11,6 +11,5 @@
 read-config-before-dropping-privileges -p0
 disable-epoll-system-call -p0
 wrong-database-location -p0
-CVE-2006-5779 -p0
 index-files-created-as-root -p0
 fix-manpage-ldapsearch -p0