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 6f534e0f7b84f8e82b41fb91df7ce8be19f1ee4c..2cba60629b0095ad6140b5b8d3d27d84fb5328c0 100644 (file)
--- 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);
+       }
 }
 
 /**