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

[Russ Allbery]

Author: rra
Date: 2007-05-23 22:06:41 +0000 (Wed, 23 May 2007)
New Revision: 801

Removed:
   openldap/trunk-2.3/debian/patches/fix-memleak-on-failed-bind
   openldap/trunk-2.3/debian/patches/kbind-security-fix
Modified:
   openldap/trunk-2.3/debian/patches/series
Log:
Remove more patches that were already applied upstream.


Deleted: openldap/trunk-2.3/debian/patches/fix-memleak-on-failed-bind
===================================================================
--- openldap/trunk-2.3/debian/patches/fix-memleak-on-failed-bind	2007-05-23 22:01:17 UTC (rev 800)
+++ openldap/trunk-2.3/debian/patches/fix-memleak-on-failed-bind	2007-05-23 22:06:41 UTC (rev 801)
@@ -1,14 +0,0 @@
-Index: servers/slapd/connection.c
-===================================================================
---- servers/slapd/connection.c.orig	2007-05-23 13:05:50.000000000 -0700
-+++ servers/slapd/connection.c	2007-05-23 13:05:54.000000000 -0700
-@@ -1767,6 +1767,9 @@ static int connection_bind_cleanup_cb( O
- 	ch_free( op->o_callback );
- 	op->o_callback = NULL;
- 
-+	ch_free( op->o_callback );
-+	op->o_callback = NULL;
-+
- 	return SLAP_CB_CONTINUE;
- }
- 

Deleted: openldap/trunk-2.3/debian/patches/kbind-security-fix
===================================================================
--- openldap/trunk-2.3/debian/patches/kbind-security-fix	2007-05-23 22:01:17 UTC (rev 800)
+++ openldap/trunk-2.3/debian/patches/kbind-security-fix	2007-05-23 22:06:41 UTC (rev 801)
@@ -1,15 +0,0 @@
-Index: servers/slapd/kerberos.c
-===================================================================
---- servers/slapd/kerberos.c.orig	2007-05-23 13:05:50.000000000 -0700
-+++ servers/slapd/kerberos.c	2007-05-23 13:05:54.000000000 -0700
-@@ -45,6 +45,10 @@ krbv4_ldap_auth(
- 		return LDAP_OTHER;
- 	}
- 
-+	if( cred->len > sizeof(ktxt->dat) ) {
-+		return LDAP_OTHER;
-+	}
-+
- 	AC_MEMCPY( ktxt->dat, cred->bv_val, cred->bv_len );
- 	ktxt->length = cred->bv_len;
- 

Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series	2007-05-23 22:01:17 UTC (rev 800)
+++ openldap/trunk-2.3/debian/patches/series	2007-05-23 22:06:41 UTC (rev 801)
@@ -13,7 +13,5 @@
 index-files-created-as-root -p0
 sasl-default-path -p0
 man-slurpd -p0
-kbind-security-fix -p0
-fix-memleak-on-failed-bind -p0
 ITS4924
 ITS4925