relay: fix socket creation for relay server on OpenBSD (closes #1213)

The socket option IPV6_V6ONLY is not needed on OpenBSD and must not be set (it
is read-only).
v2.8-utf8proc
Sébastien Helleu 2018-07-01 15:39:34 +02:00
parent 6292896021
commit 5decae145f
2 changed files with 3 additions and 2 deletions

View File

@ -54,6 +54,7 @@ Bug fixes::
* guile: fix memory leak in 7 functions returning allocated strings
* php: fix return code of functions config_write_option and config_write_line
* php: fix memory leak in 72 functions returning allocated strings
* relay: fix socket creation for relay server on OpenBSD (issue #1213)
* ruby: fix memory leak in 7 functions returning allocated strings
* script: fix memory leak in case of invalid XML content in list of scripts
* scripts: fix memory leak in hook_info callback

View File

@ -451,7 +451,7 @@ relay_server_create_socket (struct t_relay_server *server)
return 0;
}
#ifdef IPV6_V6ONLY
#if defined(IPV6_V6ONLY) && !defined(__OpenBSD__)
/* set option IPV6_V6ONLY to 0 or 1 */
if (server->ipv6)
{
@ -469,7 +469,7 @@ relay_server_create_socket (struct t_relay_server *server)
return 0;
}
}
#endif /* IPV6_V6ONLY */
#endif
/* set option SO_REUSEADDR to 1 */
set = 1;