ldap/servers/slapd/conntable.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 1bf67a4fff12aca953bbb5322737cb9ea0e5dadb
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Mon May 11 11:33:04 2015 -0600
Ticket #48122 nunc-stans FD leak
https://fedorahosted.org/389/ticket/48122
Reviewed by: mreynolds (Thanks!)
Branch: master
Fix Description: Called connection acquire from within a PR_ASSERT so
the code was only called with DEBUG active.
Platforms tested: Fedora 20, EL7
Flag Day: no
Doc impact: no
diff --git a/ldap/servers/slapd/conntable.c b/ldap/servers/slapd/conntable.c
index e7ce5e5..cd05313 100644
--- a/ldap/servers/slapd/conntable.c
+++ b/ldap/servers/slapd/conntable.c
@@ -355,7 +355,9 @@ connection_table_move_connection_on_to_active_list(Connection_Table
*ct,Connecti
PR_Lock(ct->table_mutex);
- PR_ASSERT(0 == connection_acquire_nolock (c));
+ if (connection_acquire_nolock (c)) {
+ PR_ASSERT(0);
+ }
#ifdef FOR_DEBUGGING
slapi_log_error(SLAPI_LOG_FATAL, "connection", "Moving connection into
active list\n");