From 5decae145fdc58d807a19405fbcdf321871eb50d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Sun, 1 Jul 2018 15:39:34 +0200
Subject: [PATCH] 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).
---
 ChangeLog.adoc                   | 1 +
 src/plugins/relay/relay-server.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index a87f2a829..3de116dfe 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -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
diff --git a/src/plugins/relay/relay-server.c b/src/plugins/relay/relay-server.c
index 73768e021..b10a758be 100644
--- a/src/plugins/relay/relay-server.c
+++ b/src/plugins/relay/relay-server.c
@@ -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;