From: Martin Willi <martin@strongswan.org>
Date: Wed, 14 Nov 2007 10:12:34 +0000 (-0000)
Subject: fixed daemon kill before threads are spawned
X-Git-Tag: 4.1.9~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93fc29c6cf391f51d13ded4b760ac85f5d60f13b;p=thirdparty%2Fstrongswan.git

fixed daemon kill before threads are spawned
---

diff --git a/src/charon/processing/jobs/callback_job.c b/src/charon/processing/jobs/callback_job.c
index 6f534e0f7b..2cba60629b 100644
--- a/src/charon/processing/jobs/callback_job.c
+++ b/src/charon/processing/jobs/callback_job.c
@@ -121,12 +121,7 @@ static void cancel(private_callback_job_t *this)
 {
 	pthread_t thread;
 	
-	/* wait until thread has started */
 	pthread_mutex_lock(&this->mutex);
-	while (this->thread == 0)
-	{
-		pthread_cond_wait(&this->condvar, &this->mutex);
-	}
 	thread = this->thread;
 	
 	/* terminate its children */
@@ -134,8 +129,11 @@ static void cancel(private_callback_job_t *this)
 	pthread_mutex_unlock(&this->mutex);
 	
 	/* terminate thread */
-	pthread_cancel(thread);
-	pthread_join(thread, NULL);
+	if (thread)
+	{
+		pthread_cancel(thread);
+		pthread_join(thread, NULL);
+	}
 }
 
 /**