--- libaitrpc/src/builtin.c	2010/06/28 15:18:43	1.1.1.1.2.4
+++ libaitrpc/src/builtin.c	2011/05/02 23:12:08	1.2
@@ -3,9 +3,46 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.1.1.1.2.4 2010/06/28 15:18:43 misho Exp $
+* $Id: builtin.c,v 1.2 2011/05/02 23:12:08 misho Exp $
 *
-*************************************************************************/
+**************************************************************************
+The ELWIX and AITNET software is distributed under the following
+terms:
+
+All of the documentation and software included in the ELWIX and AITNET
+Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
+
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #include "global.h"
 
 
@@ -159,12 +196,16 @@ rpcBLOBServerVars(rpc_func_t *call, int ic, rpc_val_t 
 	else
 		srv = call->func_parent;
 
+	pthread_mutex_lock(&srv->srv_blob.mtx);
 	for (i = 0, b = srv->srv_blob.blobs; b; i++, b = b->blob_next);
-	if (!(vals = rpc_srv_retValsCall(call, i)))
-		return -1;
+	if (!(vals = rpc_srv_retValsCall(call, i))) {
+		pthread_mutex_unlock(&srv->srv_blob.mtx);
+		return 0;
+	}
 
 	for (b = srv->srv_blob.blobs, v = vals; b; b = b->blob_next)
 		RPC_SET_U32(v++, b->blob_var);
+	pthread_mutex_unlock(&srv->srv_blob.mtx);
 
 	return 0;
 }
@@ -174,8 +215,7 @@ rpcBLOBServerState(rpc_func_t *call, int ic, rpc_val_t
 {
 	rpc_srv_t *srv;
 
-	RPC_CALLBACK_CHK_NUM_ARGS(call, ic);
-	RPC_CALLBACK_CHECK_INPUT(call);
+	RPC_CALLBACK_CHK_ARGS(call, ic);
 	if (!call->func_parent)
 		return -1;
 	else