Commit 8aba0b95 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5291

parent f2fd7101
...@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log ...@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
OpenLDAP 2.4.8 Engineering OpenLDAP 2.4.8 Engineering
Fixed ldapmodify verbose logging (ITS#5247) Fixed ldapmodify verbose logging (ITS#5247)
Fixed libldap ldap_parse_sasl_bind_result (ITS#5263) Fixed libldap ldap_parse_sasl_bind_result (ITS#5263)
Fixed libldap search timeout crash (ITS#5291)
Fixed slapd include handling (ITS#5276) Fixed slapd include handling (ITS#5276)
Fixed slapd non-atomic signal variables (ITS#5248) Fixed slapd non-atomic signal variables (ITS#5248)
Fixed slapd overlay ordering when moving to slapd.d (ITS#5284) Fixed slapd overlay ordering when moving to slapd.d (ITS#5284)
......
...@@ -358,7 +358,7 @@ ldap_search_st( ...@@ -358,7 +358,7 @@ ldap_search_st(
== -1 ) == -1 )
return( ld->ld_errno ); return( ld->ld_errno );
if ( ldap_result( ld, msgid, LDAP_MSG_ALL, timeout, res ) == -1 ) if ( ldap_result( ld, msgid, LDAP_MSG_ALL, timeout, res ) == -1 || !*res )
return( ld->ld_errno ); return( ld->ld_errno );
if ( ld->ld_errno == LDAP_TIMEOUT ) { if ( ld->ld_errno == LDAP_TIMEOUT ) {
...@@ -386,7 +386,7 @@ ldap_search_s( ...@@ -386,7 +386,7 @@ ldap_search_s(
== -1 ) == -1 )
return( ld->ld_errno ); return( ld->ld_errno );
if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, res ) == -1 || !res ) if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, res ) == -1 || !*res )
return( ld->ld_errno ); return( ld->ld_errno );
return( ldap_result2error( ld, *res, 0 ) ); return( ldap_result2error( ld, *res, 0 ) );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment