--- libaitrpc/src/cli.c	2010/06/18 01:48:06	1.1
+++ libaitrpc/src/cli.c	2010/06/18 15:47:33	1.1.1.1.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.1 2010/06/18 01:48:06 misho Exp $
+* $Id: cli.c,v 1.1.1.1.2.2 2010/06/18 15:47:33 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -144,7 +144,7 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 	int ret = 0, Limit = 0;
 	register int i;
 	rpc_val_t *v;
-	struct timeval tv = { DEF_CLI_TIMEOUT, 0 };
+	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
 
 	FD_ZERO(&fds);
 	memset(buf, 0, BUFSIZ);
@@ -305,8 +305,10 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 					break;
 			}
 	} else {
-		*out_argc = 0;
-		*out_vals = NULL;
+		if (out_argc)
+			*out_argc = 0;
+		if (out_vals)
+			*out_vals = NULL;
 	}
 
 	return rrpc->ret_retcode;