remove upstream merged patches

This commit is contained in:
Jan Vcelak 2012-04-24 10:44:16 +02:00
parent 6e16cb7901
commit 05bc41c858
2 changed files with 1 additions and 21 deletions

View File

@ -1,19 +0,0 @@
commit dcf94e25f57c2f24936c3ce66d2350c391354da1
Author: Howard Chu <hyc@openldap.org>
Date: Mon Mar 26 03:32:11 2012 -0700
ITS#7207 check for ld->ld_defconn
diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 0248101..2475a87 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -419,7 +419,7 @@ ldap_int_sasl_bind(
LDAP_MUTEX_LOCK( &ld->ld_conn_mutex );
ber_sockbuf_ctrl( ld->ld_sb, LBER_SB_OPT_GET_FD, &sd );
- if ( sd == AC_SOCKET_INVALID ) {
+ if ( sd == AC_SOCKET_INVALID || !ld->ld_defconn ) {
/* not connected yet */
rc = ldap_open_defconn( ld );

View File

@ -39,7 +39,6 @@ Patch7: openldap-dns-priority.patch
Patch8: openldap-syncrepl-unset-tls-options.patch
Patch9: openldap-constraint-count.patch
Patch10: openldap-man-sasl-nocanon.patch
Patch11: openldap-ld_defconn-rebind.patch
# Fedora specific patches
Patch100: openldap-fedora-systemd.patch
@ -145,7 +144,6 @@ pushd openldap-%{version}
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch100 -p1
@ -665,6 +663,7 @@ exit 0
+ server: various fixes in replication
+ server: various fixes in overlays and minor backends
+ documentation fixes
- remove patches which were merged upstream
* Thu Apr 05 2012 Jan Vcelak <jvcelak@redhat.com> 2.4.30-3
- rebuild due to libdb rebase