--- libaitrpc/src/blob.c	2010/07/08 09:18:51	1.1.2.13
+++ libaitrpc/src/blob.c	2011/05/02 23:12:08	1.2
@@ -1,3 +1,48 @@
+/*************************************************************************
+* (C) 2010 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
+*  by Michael Pounov <misho@openbsd-bg.org>
+*
+* $Author: misho $
+* $Id: blob.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"
 
 
@@ -15,8 +60,13 @@ rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
 	int f;
 	u_int rnd;
 
+#ifdef HAVE_SRANDOMDEV
 	srandomdev();
-	srandom(getpid() ^ time(NULL));
+#else
+	time_t tim;
+
+	srandom((time(&tim) ^ getpid()));
+#endif
 again:
 	rnd = random() % UINT_MAX;
 
@@ -266,7 +316,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t
 	}
 	if (hdr.hdr_cmd != error) {
 		if (hdr.hdr_len != var->val_len) {
-			rpc_SetErr(EBADMSG, "Error:: Bad return length packet ...\n");
+			rpc_SetErr(ECANCELED, "Error:: Bad return length packet ...\n");
 			return -1;
 		}
 
@@ -357,7 +407,7 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t
 	}
 	if (hdr.hdr_cmd != error) {
 		if (hdr.hdr_len != var->val_len) {
-			rpc_SetErr(EBADMSG, "Error:: Bad return length packet ...\n");
+			rpc_SetErr(ECANCELED, "Error:: Bad return length packet ...\n");
 			free(*data);
 			*data = NULL;
 			return -1;