remove the --disable-multi config switch

This switch is broken and unmaintained.
However there wasn't any ticket about it so far,
which means that it is practically unused.

Get rid of it and simplify P2MP logic.

Signed-off-by: Antonio Quartulli <a@unstable.cc>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <20170816132454.13046-1-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15275.html
Signed-off-by: David Sommerseth <davids@openvpn.net>
(cherry picked from commit 299a8f8f1aa10b5b0d006ae77c26de33d55d4a25)

diff --git a/config-msvc.h b/config-msvc.h
index 9b97e7121f6e926a7c6864343f293f92ae643ba5..0bb153dfc14028ced593e47af92ecaf18ca68ef9 100644 (file)
--- a/config-msvc.h
+++ b/config-msvc.h
@@ -4,7 +4,6 @@
 
 #define ENABLE_DEF_AUTH 1
 #define ENABLE_PF 1
-#define ENABLE_CLIENT_SERVER 1
 #define ENABLE_CRYPTO 1
 #define ENABLE_CRYPTO_OPENSSL 1
 #define ENABLE_DEBUG 1

diff --git a/configure.ac b/configure.ac
index 2502166a65728d7eebc9dca20362b7f4dd3eef36..baeff41b0732e6bcfd26264b9f44b45eddd86140 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -98,13 +98,6 @@ AC_ARG_ENABLE(
        [enable_x509_alt_username="no"]
 )
 
-AC_ARG_ENABLE(
-       [multi],
-       [AS_HELP_STRING([--disable-multi], [disable client/server support (--mode server + client mode) @<:@default=yes@:>@])],
-       ,
-       [enable_multi="yes"]
-)
-
 AC_ARG_ENABLE(
        [server],
        [AS_HELP_STRING([--disable-server], [disable server support only (but retain client support) @<:@default=yes@:>@])],
@@ -1177,7 +1170,6 @@ if test "${enable_x509_alt_username}" = "yes"; then
 fi
 
 test "${ac_cv_header_sys_uio_h}" = "yes" && AC_DEFINE([HAVE_IOVEC], [1], [struct iovec needed for IPv6 support])
-test "${enable_multi}" = "yes" && AC_DEFINE([ENABLE_CLIENT_SERVER], [1], [Enable client/server capability])
 test "${enable_server}" = "no" && AC_DEFINE([ENABLE_CLIENT_ONLY], [1], [Enable client capability only])
 test "${enable_management}" = "yes" && AC_DEFINE([ENABLE_MANAGEMENT], [1], [Enable management server capability])
 test "${enable_multihome}" = "yes" && AC_DEFINE([ENABLE_MULTIHOME], [1], [Enable multi-homed UDP server capability])

diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index 2973b5ad14425eb5cd18c42d4fd3f3b1f8c2cbd8..d9f5a34d57ead9fa0f335c53893df9615064e699 100644 (file)
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -513,7 +513,7 @@ socket_defined(const socket_descriptor_t sd)
  * Do we have point-to-multipoint capability?
  */
 
-#if defined(ENABLE_CLIENT_SERVER) && defined(ENABLE_CRYPTO) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS)
+#if defined(ENABLE_CRYPTO) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS)
 #define P2MP 1
 #else
 #define P2MP 0