ITS#5577

diff --git a/CHANGES b/CHANGES
index 2fefc399f8aa13468f86d1d6b49bdc1eb82c9cc0..735f81e600e33b44b779ea8d443a2818c71b101d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.11 Engineering
        Added libldap assertion control (ITS#5560)
+       Fixed libldap GnuTLS CRL result handling (ITS#5577)
        Fixed slapd crash with no listeners (ITS#5563)
        Fixed slapd sets memory leak (ITS#5557)
        Fixed slapd-sock, back-shell buffer count (ITS#5558)

diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index a40601b784128c3f2f9db48e3a52ad20bf0048ec..c966628390e93157fda74ddefbd2e3864d2fb8a9 100644 (file)
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -755,6 +755,7 @@ ldap_int_tls_init_ctx( struct ldapoptions *lo, int is_server )
                        crlfile,
                        GNUTLS_X509_FMT_PEM );
                if ( rc < 0 ) goto error_exit;
+               rc = 0;
        }
        if ( is_server ) {
                gnutls_dh_params_init (&((tls_ctx*)