summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoichiro IWAO <meta@vmeta.jp>2015-07-01 04:19:38 +0000
committerKoichiro IWAO <meta@vmeta.jp>2015-07-02 15:08:56 +0900
commit536ee41c5e53647c54f63eb9179224756d02a8f6 (patch)
tree68801c571f974c09c1506f1e749fb25408c9d3d0
parent5bc0453605d816d84b4ca1816de22362ac614113 (diff)
downloadxrdp-proprietary-536ee41c5e53647c54f63eb9179224756d02a8f6.tar.gz
xrdp-proprietary-536ee41c5e53647c54f63eb9179224756d02a8f6.zip
common: add --enable-ipv6only option
-rw-r--r--common/os_calls.c4
-rw-r--r--configure.ac9
2 files changed, 13 insertions, 0 deletions
diff --git a/common/os_calls.c b/common/os_calls.c
index 46bc0e8a..04b2ac38 100644
--- a/common/os_calls.c
+++ b/common/os_calls.c
@@ -479,7 +479,11 @@ g_tcp_socket(void)
{
if (option_value != 0)
{
+#if defined(XRDP_ENABLE_IPV6ONLY)
+ option_value = 1;
+#else
option_value = 0;
+#endif
option_len = sizeof(option_value);
if (setsockopt(rv, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&option_value,
option_len) < 0)
diff --git a/configure.ac b/configure.ac
index bf51cc53..26917325 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,9 @@ AM_CONDITIONAL(SESMAN_NOPAM, [test x$enable_pam != xyes])
AC_ARG_ENABLE(ipv6, AS_HELP_STRING([--enable-ipv6],
[Build IPv6 support (default: no, experimental)]),
[], [enable_ipv6=no])
+AC_ARG_ENABLE(ipv6only, AS_HELP_STRING([--enable-ipv6only],
+ [Build IPv6-only (default: no)]),
+ [], [enable_ipv6only=no])
AC_ARG_ENABLE(kerberos, AS_HELP_STRING([--enable-kerberos],
[Build kerberos support (default: no)]),
[], [enable_kerberos=no])
@@ -106,6 +109,12 @@ then
fi
fi
+if test "x$enable_ipv6only" = "xyes"
+then
+ enable_ipv6=yes
+ AC_DEFINE([XRDP_ENABLE_IPV6ONLY],1,[Enable IPv6 only])
+fi
+
if test "x$enable_ipv6" = "xyes"
then
AC_DEFINE([XRDP_ENABLE_IPV6],1,[Enable IPv6])