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

ITS#5318

parent cd97b44d
...@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log ...@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
OpenLDAP 2.4.10 Engineering OpenLDAP 2.4.10 Engineering
Fixed libldap file descriptor leak with SELinux (ITS#5507) Fixed libldap file descriptor leak with SELinux (ITS#5507)
Fixed libldap ld_defconn cleanup if it was freed (ITS#5518, ITS#5525) Fixed libldap ld_defconn cleanup if it was freed (ITS#5518, ITS#5525)
Fixed libldap msgid handling (ITS#5318)
Fixed libldap_r missing stubs (ITS#5519) Fixed libldap_r missing stubs (ITS#5519)
Fixed slapd missing termination of integerFilter keys (ITS#5503) Fixed slapd missing termination of integerFilter keys (ITS#5503)
Fixed slapd multiple attrs in URI (ITS#5516) Fixed slapd multiple attrs in URI (ITS#5516)
......
...@@ -582,6 +582,11 @@ nextresp3: ...@@ -582,6 +582,11 @@ nextresp3:
/* id == 0 iff unsolicited notification message (RFC 4511) */ /* id == 0 iff unsolicited notification message (RFC 4511) */
/* id < 0 is invalid, just toss it. FIXME: should we disconnect? */
if ( id < 0 ) {
goto retry_ber;
}
/* if it's been abandoned, toss it */ /* if it's been abandoned, toss it */
if ( id > 0 ) { if ( id > 0 ) {
if ( ldap_abandoned( ld, id, &idx ) ) { if ( ldap_abandoned( ld, id, &idx ) ) {
...@@ -602,8 +607,8 @@ nextresp3: ...@@ -602,8 +607,8 @@ nextresp3:
} }
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"abandoned/discarded ld %p msgid %ld message type %s\n", "abandoned/discarded ld %p msgid %d message type %s\n",
(void *)ld, (long)id, ldap_int_msgtype2str( tag ) ); (void *)ld, id, ldap_int_msgtype2str( tag ) );
retry_ber: retry_ber:
ber_free( ber, 1 ); ber_free( ber, 1 );
...@@ -629,8 +634,8 @@ retry_ber: ...@@ -629,8 +634,8 @@ retry_ber:
} }
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"no request for response on ld %p msgid %ld message type %s (tossing)\n", "no request for response on ld %p msgid %d message type %s (tossing)\n",
(void *)ld, (long)id, msg ); (void *)ld, id, msg );
goto retry_ber; goto retry_ber;
} }
...@@ -652,8 +657,8 @@ nextresp2: ...@@ -652,8 +657,8 @@ nextresp2:
} }
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"read1msg: ld %p msgid %ld message type %s\n", "read1msg: ld %p msgid %d message type %s\n",
(void *)ld, (long)lr->lr_msgid, ldap_int_msgtype2str( tag ) ); (void *)ld, id, ldap_int_msgtype2str( tag ) );
if ( id == 0 ) { if ( id == 0 ) {
/* unsolicited notification message (RFC 4511) */ /* unsolicited notification message (RFC 4511) */
...@@ -900,8 +905,8 @@ nextresp2: ...@@ -900,8 +905,8 @@ nextresp2:
{ {
id = lr->lr_msgid; id = lr->lr_msgid;
tag = lr->lr_res_msgtype; tag = lr->lr_res_msgtype;
Debug( LDAP_DEBUG_TRACE, "request done: ld %p msgid %ld\n", Debug( LDAP_DEBUG_TRACE, "request done: ld %p msgid %d\n",
(void *)ld, (long) id, 0 ); (void *)ld, id, 0 );
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"res_errno: %d, res_error: <%s>, " "res_errno: %d, res_error: <%s>, "
"res_matched: <%s>\n", "res_matched: <%s>\n",
...@@ -1156,8 +1161,8 @@ nextresp2: ...@@ -1156,8 +1161,8 @@ nextresp2:
goto exit; goto exit;
} }
Debug( LDAP_DEBUG_TRACE, "adding response ld %p msgid %ld type %ld:\n", Debug( LDAP_DEBUG_TRACE, "adding response ld %p msgid %d type %ld:\n",
(void *)ld, (long) newmsg->lm_msgid, (long) newmsg->lm_msgtype ); (void *)ld, newmsg->lm_msgid, (long) newmsg->lm_msgtype );
/* part of a search response - add to end of list of entries */ /* part of a search response - add to end of list of entries */
l->lm_chain_tail->lm_chain = newmsg; l->lm_chain_tail->lm_chain = newmsg;
......
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