--- libaitrpc/src/srv.c	2011/08/19 07:19:08	1.3.2.5
+++ libaitrpc/src/srv.c	2011/08/19 07:39:29	1.3.2.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.3.2.5 2011/08/19 07:19:08 misho Exp $
+* $Id: srv.c,v 1.3.2.6 2011/08/19 07:39:29 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -536,7 +536,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 			return -1;
 		}
 
-	while (!blob_Kill && !rpc_Kill) {
+	while (srv->srv_blob.state != kill && srv->srv_kill != kill) {
 		for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++)
 			if (!c->cli_sa.sa_family)
 				break;
@@ -787,7 +787,7 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 			return -1;
 		}
 
-	while (!rpc_Kill) {
+	while (srv->srv_kill != kill) {
 		for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++)
 			if (!c->cli_sa.sa_family)
 				break;