Browse code
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>
Antonio Quartulli authored on 2017/08/16 22:24:54Showing 3 changed files
| ... | ... |
@@ -99,13 +99,6 @@ AC_ARG_ENABLE( |
| 99 | 99 |
) |
| 100 | 100 |
|
| 101 | 101 |
AC_ARG_ENABLE( |
| 102 |
- [multi], |
|
| 103 |
- [AS_HELP_STRING([--disable-multi], [disable client/server support (--mode server + client mode) @<:@default=yes@:>@])], |
|
| 104 |
- , |
|
| 105 |
- [enable_multi="yes"] |
|
| 106 |
-) |
|
| 107 |
- |
|
| 108 |
-AC_ARG_ENABLE( |
|
| 109 | 102 |
[server], |
| 110 | 103 |
[AS_HELP_STRING([--disable-server], [disable server support only (but retain client support) @<:@default=yes@:>@])], |
| 111 | 104 |
, |
| ... | ... |
@@ -1197,7 +1190,6 @@ if test "${enable_x509_alt_username}" = "yes"; then
|
| 1197 | 1197 |
fi |
| 1198 | 1198 |
|
| 1199 | 1199 |
test "${ac_cv_header_sys_uio_h}" = "yes" && AC_DEFINE([HAVE_IOVEC], [1], [struct iovec needed for IPv6 support])
|
| 1200 |
-test "${enable_multi}" = "yes" && AC_DEFINE([ENABLE_CLIENT_SERVER], [1], [Enable client/server capability])
|
|
| 1201 | 1200 |
test "${enable_server}" = "no" && AC_DEFINE([ENABLE_CLIENT_ONLY], [1], [Enable client capability only])
|
| 1202 | 1201 |
test "${enable_management}" = "yes" && AC_DEFINE([ENABLE_MANAGEMENT], [1], [Enable management server capability])
|
| 1203 | 1202 |
test "${enable_multihome}" = "yes" && AC_DEFINE([ENABLE_MULTIHOME], [1], [Enable multi-homed UDP server capability])
|
| ... | ... |
@@ -513,7 +513,7 @@ socket_defined(const socket_descriptor_t sd) |
| 513 | 513 |
* Do we have point-to-multipoint capability? |
| 514 | 514 |
*/ |
| 515 | 515 |
|
| 516 |
-#if defined(ENABLE_CLIENT_SERVER) && defined(ENABLE_CRYPTO) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS) |
|
| 516 |
+#if defined(ENABLE_CRYPTO) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS) |
|
| 517 | 517 |
#define P2MP 1 |
| 518 | 518 |
#else |
| 519 | 519 |
#define P2MP 0 |