Commit 518dd3a9 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6744

parent 68a2cd78
......@@ -16,6 +16,7 @@ OpenLDAP 2.4.24 Engineering
Fixed libldap GnuTLS hang on socket close (ITS#6673)
Fixed libldap sasl partial write handling (ITS#6639)
Fixed libldap referral chasing (ITS#6602)
Fixed libldap leak when chasing referrals (ITS#6744)
Fixed libldap url parsing with NULL host (ITS#6653)
Fixed liblutil getpass prompts (ITS#6702)
Fixed ldapsearch segfault with deref (ITS#6638)
......
......@@ -826,6 +826,7 @@ nextresp2:
Debug( LDAP_DEBUG_TRACE,
"read1msg: mark request completed, ld %p msgid %d\n",
(void *)ld, lr->lr_msgid, 0);
tmplr = lr;
while ( lr->lr_parent != NULL ) {
merge_error_info( ld, lr->lr_parent, lr );
......@@ -834,6 +835,12 @@ nextresp2:
break; /* not completely done yet */
}
}
/* ITS#6744: Original lr was refcounted when we retrieved it,
* must release it now that we're working with the parent
*/
if ( tmplr->lr_parent ) {
ldap_return_request( ld, tmplr, 0 );
}
/* Check if all requests are finished, lr is now parent */
tmplr = lr;
......
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