Fixed invalid cookie in pagedResults control (ITS#3089)

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index b829d2c8ca48b28a30215c2d8a8db8a1354a938d..e59a95c371cd9389dca503f25e5ee8948d7c4ec0 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1279,7 +1279,7 @@ int connection_read(ber_socket_t s)
 
 #ifdef HAVE_TLS
        if ( c->c_is_tls && c->c_needs_tls_accept ) {
-               rc = ldap_pvt_tls_accept( c->c_sb, NULL );
+               rc = ldap_pvt_tls_accept( c->c_sb, slap_tls_ctx );
                if ( rc < 0 ) {
 #if 0 /* required by next #if 0 */
                        struct timeval tv;
@@ -1318,7 +1318,7 @@ int connection_read(ber_socket_t s)
 
                } else if ( rc == 0 ) {
                        void *ssl;
-                       struct berval authid = { 0, NULL };
+                       struct berval authid = BER_BVNULL;
 
                        c->c_needs_tls_accept = 0;