From a721b7ef66a9220abef7283554ea442b8b3eda53 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Wed, 18 Mar 2009 20:46:44 -0400 Subject: [PATCH] --- yaml --- r: 139553 b: refs/heads/master c: 7d21c0f9845f0ce4e81baac3519fbb2c6c2cc908 h: refs/heads/master i: 139551: 579a652f614ca7d2d65d05c7b512bd53618a54c6 v: v3 --- [refs] | 2 +- trunk/net/sunrpc/svcsock.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 39e8ffb6ea6f..f1bd67d47da4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26298caacac3e4754194b13aef377706d5de6cf6 +refs/heads/master: 7d21c0f9845f0ce4e81baac3519fbb2c6c2cc908 diff --git a/trunk/net/sunrpc/svcsock.c b/trunk/net/sunrpc/svcsock.c index d00bc3307745..ac6cd65220c7 100644 --- a/trunk/net/sunrpc/svcsock.c +++ b/trunk/net/sunrpc/svcsock.c @@ -1144,13 +1144,11 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv, svc_tcp_init(svsk, serv); /* - * We start one listener per sv_serv. We want AF_INET - * requests to be automatically shunted to our PF_INET6 - * listener using a mapped IPv4 address. Make sure - * no-one starts an equivalent IPv4 listener, which - * would steal our incoming connections. + * If this is a PF_INET6 listener, we want to avoid + * getting requests from IPv4 remotes. Those should + * be shunted to a PF_INET listener via rpcbind. */ - val = 0; + val = 1; if (inet->sk_family == PF_INET6) kernel_setsockopt(sock, SOL_IPV6, IPV6_V6ONLY, (char *)&val, sizeof(val));