Commit 4d52e10b authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5862

parent ee1b7727
......@@ -28,6 +28,7 @@ OpenLDAP 2.4.24 Engineering
Fixed ldapsearch segfault with deref (ITS#6638)
Fixed ldapsearch multiple controls parsing (ITS#6651)
Fixed slapd acl parsing overflow (ITS#6611)
Fixed slapd assert control (ITS#5862)
Fixed slapd support for BDB 5.0+ (ITS#6698)
Fixed slapd config leak with olcDbDirectory (ITS#6634)
Fixed slapd connectionless warnings (ITS#6747)
......
......@@ -274,6 +274,12 @@ fe_op_search( Operation *op, SlapReply *rs )
goto return_results;
} else if ( entry != NULL ) {
if ( get_assert( op ) &&
( test_filter( op, entry, get_assertion( op )) != LDAP_COMPARE_TRUE )) {
rs->sr_err = LDAP_ASSERTION_FAILED;
goto fail1;
}
rs->sr_err = test_filter( op, entry, op->ors_filter );
if( rs->sr_err == LDAP_COMPARE_TRUE ) {
......@@ -292,9 +298,9 @@ fe_op_search( Operation *op, SlapReply *rs )
rs->sr_entry = NULL;
rs->sr_operational_attrs = NULL;
}
entry_free( entry );
rs->sr_err = LDAP_SUCCESS;
fail1:
entry_free( entry );
send_ldap_result( op, rs );
goto return_results;
}
......
Markdown is supported
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