aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2015-02-24 15:59:35 +0100
committerMartin Willi <martin@revosec.ch>2015-02-24 15:59:35 +0100
commit2113f482712b441ba4516cbad26d328a5be15d28 (patch)
tree4394c9789f8d7c059d93c719c8d09288a9b8ea78
parent0ae862efd1a0225a13ab1e8d18cbf749cf3a2023 (diff)
downloadstrongswan-2113f482712b441ba4516cbad26d328a5be15d28.tar.bz2
strongswan-2113f482712b441ba4516cbad26d328a5be15d28.tar.xz
host-resolver: Disable resolver thread cancellation by default
The default of new threads is cancellable, but the host-resolver thread code clearly expects the opposite.
-rw-r--r--src/libstrongswan/networking/host_resolver.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstrongswan/networking/host_resolver.c b/src/libstrongswan/networking/host_resolver.c
index a7524ac23..cb8b48b45 100644
--- a/src/libstrongswan/networking/host_resolver.c
+++ b/src/libstrongswan/networking/host_resolver.c
@@ -163,6 +163,9 @@ static void *resolve_hosts(private_host_resolver_t *this)
int error;
bool old, timed_out;
+ /* default resolver threads to non-cancellable */
+ thread_cancelability(FALSE);
+
while (TRUE)
{
this->mutex->lock(this->mutex);