--- libaitrpc/src/builtin.c	2012/07/22 20:44:13	1.9
+++ libaitrpc/src/builtin.c	2012/11/19 21:50:26	1.11
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.9 2012/07/22 20:44:13 misho Exp $
+* $Id: builtin.c,v 1.11 2012/11/19 21:50:26 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -101,7 +101,7 @@ rpcServerCalls(rpc_cli_t *cli, struct tagRPCCall *rpc,
 	RPC_CALLBACK_CHECK_INPUT(cli);
 	srv = RPC_SRV_SERVER(cli);
 
-	TAILQ_FOREACH(f, &srv->srv_funcs, func_node)
+	SLIST_FOREACH(f, &srv->srv_funcs, func_next)
 		i++;
 	len = i * STRSIZ;
 
@@ -111,7 +111,7 @@ rpcServerCalls(rpc_cli_t *cli, struct tagRPCCall *rpc,
 	} else
 		memset(val, 0, len);
 
-	TAILQ_FOREACH(f, &srv->srv_funcs, func_node)
+	SLIST_FOREACH(f, &srv->srv_funcs, func_next)
 		if (AIT_ADDR(&f->func_name)) {
 			memset(str, 0, sizeof str);
 			snprintf(str, sizeof str, "/%hu/0x%p; ", AIT_KEY(&f->func_name), 
@@ -148,9 +148,10 @@ rpcServerShutdown(rpc_cli_t *cli, struct tagRPCCall *r
 
 	RPC_CALLBACK_CHECK_INPUT(cli);
 	srv = RPC_SRV_SERVER(cli);
+	
+	rpc_freeCli(cli);
 
 	srv->srv_kill = 1;
-
 	return 0;
 }
 
@@ -172,8 +173,9 @@ rpcBLOBServerShutdown(rpc_cli_t *cli, struct tagRPCCal
 	RPC_CALLBACK_CHECK_INPUT(cli);
 	srv = RPC_SRV_SERVER(cli);
 
-	srv->srv_blob.kill = 1;
+	rpc_freeBLOBCli(cli);
 
+	srv->srv_blob.kill = 1;
 	return 0;
 }