D54942.id170681.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D54942.id170681.diff
View Options

	Index: sys/netinet6/in6_pcb.c
	===================================================================
	--- sys/netinet6/in6_pcb.c
	+++ sys/netinet6/in6_pcb.c
	@@ -113,14 +113,6 @@
	#include <netinet6/in6_fib.h>
	#include <netinet6/scope6_var.h>

	-SYSCTL_DECL(_net_inet6);
	-SYSCTL_DECL(_net_inet6_ip6);
	-VNET_DEFINE_STATIC(int, connect_in6addr_wild) = 0;
	-#define V_connect_in6addr_wild VNET(connect_in6addr_wild)
	-SYSCTL_INT(_net_inet6_ip6, OID_AUTO, connect_in6addr_wild,
	- CTLFLAG_VNET \| CTLFLAG_RW, &VNET_NAME(connect_in6addr_wild), 0,
	- "Allow connecting to the unspecified address for connect(2)");
	-
	int
	in6_pcbsetport(struct in6_addr laddr, struct inpcb inp, struct ucred *cred)
	{
	@@ -396,16 +388,8 @@
	if ((error = sa6_embedscope(sin6, V_ip6_use_defzone)) != 0)
	return(error);

	- if (V_connect_in6addr_wild && !CK_STAILQ_EMPTY(&V_in6_ifaddrhead)) {
	- /*
	- * If the destination address is UNSPECIFIED addr,
	- * use the loopback addr, e.g ::1.
	- */
	- if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr))
	- sin6->sin6_addr = in6addr_loopback;
	- } else if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
	+ if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr))
	return (ENETUNREACH);
	- }

	if ((error = prison_remote_ip6(inp->inp_cred, &sin6->sin6_addr)) != 0)
	return (error);