mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-30 13:30:57 +08:00
ITS#1655 and ITS#1660 fixes from HEAD
This commit is contained in:
parent
216bc238a0
commit
e60d7eb314
@ -212,15 +212,15 @@ static Connection* connection_get( ber_socket_t s )
|
|||||||
ber_socket_t i, sd;
|
ber_socket_t i, sd;
|
||||||
|
|
||||||
for(i=0; i<dtblsize; i++) {
|
for(i=0; i<dtblsize; i++) {
|
||||||
ber_sockbuf_ctrl( connections[i].c_sb,
|
|
||||||
LBER_SB_OPT_GET_FD, &sd );
|
|
||||||
|
|
||||||
if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) {
|
if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) {
|
||||||
assert( connections[i].c_conn_state == SLAP_C_INVALID );
|
assert( connections[i].c_conn_state == SLAP_C_INVALID );
|
||||||
assert( connections[i].c_sb == 0 );
|
assert( connections[i].c_sb == 0 );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ber_sockbuf_ctrl( connections[i].c_sb,
|
||||||
|
LBER_SB_OPT_GET_FD, &sd );
|
||||||
|
|
||||||
if( connections[i].c_struct_state == SLAP_C_UNUSED ) {
|
if( connections[i].c_struct_state == SLAP_C_UNUSED ) {
|
||||||
assert( connections[i].c_conn_state == SLAP_C_INVALID );
|
assert( connections[i].c_conn_state == SLAP_C_INVALID );
|
||||||
assert( sd == AC_SOCKET_INVALID );
|
assert( sd == AC_SOCKET_INVALID );
|
||||||
@ -551,7 +551,7 @@ connection_destroy( Connection *c )
|
|||||||
*/
|
*/
|
||||||
if (strncmp(c->c_peer_name, "PATH=", 5) == 0) {
|
if (strncmp(c->c_peer_name, "PATH=", 5) == 0) {
|
||||||
char *path = c->c_peer_name + 5;
|
char *path = c->c_peer_name + 5;
|
||||||
if (path != '\0') {
|
if (path[0] != '\0') {
|
||||||
(void)unlink(path);
|
(void)unlink(path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user