[389-commits] ldap/servers

ldap/servers/slapd/daemon.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 02d8e0c0fc91750d2114b05afebdd457e4a04adf
Author: Mark Reynolds <mreynolds@redhat.com>
Date: Thu Jun 23 07:22:47 2016 -0400

Ticket 48898 - Crash during shutdown if nunc-stans is enabled

Bug Description: During server shutdown the connection table was
freed before we shut down the nunc-stans thread
pool. This lead to a crash when a freed connection
pointer was deferenced in ns_handle_closure.

Fix Description: Close down the nunc-stans thread pool before freeing
the connection table.

https://fedorahosted.org/389/ticket/48898

Reviewed by: nhosoi(Thanks!)

diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 862f6e7..bee2fc0 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -1330,6 +1330,16 @@ void slapd_daemon( daemon_ports_t *ports )
mapping_tree_free ();
}

+#ifdef ENABLE_NUNC_STANS
+ /*
+ * We need to shutdown the nunc-stans thread pool before we free the
+ * connection table.
+ */
+ if (enable_nunc_stans) {
+ ns_thrpool_destroy(tp);
+ }
+