--- libaitrpc/src/builtin.c	2015/07/02 22:28:15	1.22
+++ libaitrpc/src/builtin.c	2015/07/19 23:54:48	1.22.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.22 2015/07/02 22:28:15 misho Exp $
+* $Id: builtin.c,v 1.22.2.1 2015/07/19 23:54:48 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -148,9 +148,13 @@ rpcServerShutdown(RPC_CALL_STDARGS)
 	RPC_CALLBACK_CHECK_INPUT(cli);
 	srv = RPC_SRV_SERVER(cli);
 	
-	srv->srv_kill = 1;
 	if (srv->srv_blob.tid)
 		pthread_kill(srv->srv_blob.tid, SIGFBLOB);
+	while (srv->srv_blob.root) {
+		srv->srv_blob.kill = 1;
+		usleep(1000);
+	}
+	srv->srv_kill = 1;
 	return 0;
 }