--- libaitrpc/src/builtin.c	2012/11/13 09:22:10	1.10
+++ libaitrpc/src/builtin.c	2012/11/19 15:54:47	1.10.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.10 2012/11/13 09:22:10 misho Exp $
+* $Id: builtin.c,v 1.10.2.2 2012/11/19 15:54:47 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -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;
 }