D28478.id83358.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D28478.id83358.diff
View Options

	Index: contrib/netbsd-tests/lib/libc/rpc/t_rpc.c
	===================================================================
	--- contrib/netbsd-tests/lib/libc/rpc/t_rpc.c
	+++ contrib/netbsd-tests/lib/libc/rpc/t_rpc.c
	@@ -54,12 +54,6 @@
	return 0;
	}

	-#ifdef __FreeBSD__
	-#define __rpc_control rpc_control
	-#endif
	-
	-extern bool_t __rpc_control(int, void *);
	-
	static void
	onehost(const char host, const char transp)
	{
	@@ -72,11 +66,21 @@
	*/
	tv.tv_sec = 0;
	tv.tv_usec = 500000;
	+#ifdef __FreeBSD__
	+ /*
	+ * FreeBSD does not allow setting the timeout using __rpc_control,
	+ * but does have clnt_create_timed() that allows passing a timeout.
	+ */
	+ if ((clnt = clnt_create_timed(host, RPCBPROG, RPCBVERS, transp,
	+ &tv)) == NULL)
	+ SKIPX(, "clnt_create (%s)", clnt_spcreateerror(""));
	+#else
	#define CLCR_SET_RPCB_TIMEOUT 2
	__rpc_control(CLCR_SET_RPCB_TIMEOUT, &tv);

	if ((clnt = clnt_create(host, RPCBPROG, RPCBVERS, transp)) == NULL)
	SKIPX(, "clnt_create (%s)", clnt_spcreateerror(""));
	+#endif

	tv.tv_sec = 1;
	tv.tv_usec = 0;