D51084.id.diff
No OneTemporary
Actions

Size

836 B

Referenced Files

None

Subscribers

None

D51084.id.diff
View Options

	diff --git a/sys/rpc/clnt_rc.c b/sys/rpc/clnt_rc.c
	--- a/sys/rpc/clnt_rc.c
	+++ b/sys/rpc/clnt_rc.c
	@@ -198,6 +198,12 @@
	newclient = clnt_vc_create(so,
	(struct sockaddr *) &rc->rc_addr, rc->rc_prog, rc->rc_vers,
	rc->rc_sendsz, rc->rc_recvsz, rc->rc_intr);
	+ /*
	+ * CLSET_FD_CLOSE must be done now, in case rpctls_connect()
	+ * fails just below.
	+ */
	+ if (newclient != NULL)
	+ CLNT_CONTROL(newclient, CLSET_FD_CLOSE, 0);
	if (rc->rc_tls && newclient != NULL) {
	CURVNET_SET(so->so_vnet);
	stat = rpctls_connect(newclient, rc->rc_tlscertname, so,
	@@ -236,7 +242,6 @@
	goto out;
	}

	- CLNT_CONTROL(newclient, CLSET_FD_CLOSE, 0);
	CLNT_CONTROL(newclient, CLSET_CONNECT, &one);
	CLNT_CONTROL(newclient, CLSET_TIMEOUT, &rc->rc_timeout);
	CLNT_CONTROL(newclient, CLSET_RETRY_TIMEOUT, &rc->rc_retry);