summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Ratchov <ratchov@cvs.openbsd.org>2016-01-08 16:22:10 +0000
committerAlexandre Ratchov <ratchov@cvs.openbsd.org>2016-01-08 16:22:10 +0000
commit0ae9d7ef5cd651fd73fe123f0b0826e8619d2119 (patch)
treed00f8de3b375fdb788592af4a9b5c0d4b5efae6d
parenta1e390b526321b81ff09163c7bf503527a48f9d1 (diff)
Fix changes that last commit undid by mistake, sorry.
-rw-r--r--usr.bin/sndiod/listen.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/usr.bin/sndiod/listen.c b/usr.bin/sndiod/listen.c
index 04d9cac5984..f1f1c312025 100644
--- a/usr.bin/sndiod/listen.c
+++ b/usr.bin/sndiod/listen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: listen.c,v 1.10 2016/01/08 16:17:31 ratchov Exp $ */
+/* $OpenBSD: listen.c,v 1.11 2016/01/08 16:22:09 ratchov Exp $ */
/*
* Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
*
@@ -165,21 +165,6 @@ listen_new_tcp(char *addr, unsigned int port)
log_puts(": failed to set SO_REUSEADDR\n");
goto bad_close;
}
- if (ai->ai_family == AF_INET6) {
- /*
- * make sure IPv6 sockets are restricted to IPv6
- * addresses because we already use a IP socket
- * for IP addresses
- */
- opt = 1;
- if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
- &opt, sizeof(int)) < 0) {
- log_puts(addr);
- log_puts(": failed to set IPV6_V6ONLY\n");
- goto bad_close;
- }
- }
-
if (bind(s, ai->ai_addr, ai->ai_addrlen) < 0) {
log_puts(addr);
log_puts(": failed to bind socket\n");