--- libaitsched/src/hooks.c	2012/08/21 12:54:39	1.14
+++ libaitsched/src/hooks.c	2012/08/22 13:37:23	1.14.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.14 2012/08/21 12:54:39 misho Exp $
+* $Id: hooks.c,v 1.14.2.2 2012/08/22 13:37:23 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -210,6 +210,9 @@ sched_hook_cancel(void *task, void *arg __unused)
 		case taskTHREAD:
 #ifdef HAVE_LIBPTHREAD
 			pthread_cancel((pthread_t) TASK_VAL(t));
+			if (TASK_FLAG(t) == PTHREAD_CREATE_JOINABLE)	/* joinable thread */
+				schedTask(TASK_ROOT(t), _sched_threadJoin, TASK_ARG(t),
+						TASK_VAL(t), TASK_DATA(t), TASK_DATLEN(t));
 #endif
 			TASK_UNLOCK(t);
 		default:
@@ -233,15 +236,20 @@ sched_hook_thread(void *task, void *arg)
 {
 	sched_task_t *t = task;
 	pthread_t tid;
+	sigset_t ns, os;
 
 	if (!t || !TASK_ROOT(t))
 		return (void*) -1;
 
+	sigfillset(&ns);
+	pthread_sigmask(SIG_BLOCK, &ns, &os);
 	if (pthread_create(&tid, (pthread_attr_t*) arg, 
 				(void *(*)(void*)) TASK_FUNC(t), t)) {
 		LOGERR;
+		pthread_sigmask(SIG_SETMASK, &os, NULL);
 		return (void*) -1;
 	}
+	pthread_sigmask(SIG_SETMASK, &os, NULL);
 
 	if (!TASK_ISLOCKED(t))
 		TASK_LOCK(t);