1 files changed, 2 insertions, 8 deletions

diff --git a/sshd.c b/sshd.c
index 13a455d1f..04d8f9fa0 100644
--- a/sshd.c
+++ b/sshd.c
@@ -979,15 +979,9 @@ server_listen(void)
                     &on, sizeof(on)) == -1)
                         error("setsockopt SO_REUSEADDR: %s", strerror(errno));
 
-#ifdef IPV6_V6ONLY
                 /* Only communicate in IPv6 over AF_INET6 sockets. */
-                if (ai->ai_family == AF_INET6) {
-                        if (setsockopt(listen_sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                            &on, sizeof(on)) == -1)
-                                error("setsockopt IPV6_V6ONLY: %s",
-                                    strerror(errno));
-                }
-#endif
+                if (ai->ai_family == AF_INET6)
+                        sock_set_v6only(listen_sock);
 
                 debug("Bind to port %s on %s.", strport, ntop);