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

ITS#6585

parent 0579cc86
OpenLDAP 2.4 Change Log OpenLDAP 2.4 Change Log
OpenLDAP 2.4.24 Engineering OpenLDAP 2.4.24 Engineering
Fixed liblber to not close invalid sockets (ITS#6585)
Fixed slapd modify to return actual error (ITS#6581) Fixed slapd modify to return actual error (ITS#6581)
Fixed slapd-bdb entry cache delete failure (ITS#6577) Fixed slapd-bdb entry cache delete failure (ITS#6577)
......
...@@ -541,6 +541,7 @@ sb_stream_close( Sockbuf_IO_Desc *sbiod ) ...@@ -541,6 +541,7 @@ sb_stream_close( Sockbuf_IO_Desc *sbiod )
{ {
assert( sbiod != NULL ); assert( sbiod != NULL );
assert( SOCKBUF_VALID( sbiod->sbiod_sb ) ); assert( SOCKBUF_VALID( sbiod->sbiod_sb ) );
if ( sbiod->sbiod_sb->sb_fd != AC_SOCKET_INVALID )
tcp_close( sbiod->sbiod_sb->sb_fd ); tcp_close( sbiod->sbiod_sb->sb_fd );
return 0; return 0;
} }
...@@ -754,6 +755,7 @@ sb_fd_close( Sockbuf_IO_Desc *sbiod ) ...@@ -754,6 +755,7 @@ sb_fd_close( Sockbuf_IO_Desc *sbiod )
assert( sbiod != NULL ); assert( sbiod != NULL );
assert( SOCKBUF_VALID( sbiod->sbiod_sb ) ); assert( SOCKBUF_VALID( sbiod->sbiod_sb ) );
if ( sbiod->sbiod_sb->sb_fd != AC_SOCKET_INVALID )
close( sbiod->sbiod_sb->sb_fd ); close( sbiod->sbiod_sb->sb_fd );
return 0; return 0;
} }
...@@ -957,6 +959,7 @@ sb_dgram_close( Sockbuf_IO_Desc *sbiod ) ...@@ -957,6 +959,7 @@ sb_dgram_close( Sockbuf_IO_Desc *sbiod )
assert( sbiod != NULL ); assert( sbiod != NULL );
assert( SOCKBUF_VALID( sbiod->sbiod_sb ) ); assert( SOCKBUF_VALID( sbiod->sbiod_sb ) );
if ( sbiod->sbiod_sb->sb_fd != AC_SOCKET_INVALID )
tcp_close( sbiod->sbiod_sb->sb_fd ); tcp_close( sbiod->sbiod_sb->sb_fd );
return 0; return 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