| Message ID | 20200724181324.19037-1-gert@greenie.muc.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] Repair --inetd | expand |
Am 24.07.20 um 20:13 schrieb Gert Doering: > commit 25a422cc60 deprecated --inetd, which is still something we want. > > Unlike all "usual" deprecated option warnings, we cannot print this at > option parsing time, because we need logging to be set up first - otherwise > the deprecation warning is sent via the socket (on stdin/stdout) > towards the connecting client, totally breaking this mode. > > (Which is why we want to deprecate it: too special even for us) Acked-By: Arne Schwabe <arne@rfc2549.org>
Patch has been applied to the master branch.
commit 96d57b0fc5cc2bf08fdf78141130e3c8092ca4d5
Author: Gert Doering
Date: Fri Jul 24 20:13:24 2020 +0200
Repair --inetd
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <20200724181324.19037-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20574.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
--
kind regards,
Gert Doering
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 1a915e27..a8a9bb97 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2050,6 +2050,11 @@ options_postprocess_verify_ce(const struct options *options, const struct connec msg(M_USAGE, "--inetd nowait only makes sense in --dev tap mode"); } + if (options->inetd) + { + msg(M_WARN, "DEPRECATED OPTION: --inetd mode is deprecated " + "and will be removed in OpenVPN 2.6"); + } if (options->lladdr && dev != DEV_TYPE_TAP) { @@ -5802,8 +5807,6 @@ add_option(struct options *options, } else if (streq(p[0], "inetd") && !p[3]) { - msg(M_WARN, "DEPRECATED OPTION: --inetd mode is deprecated " - "and will be removed in OpenVPN 2.6"); VERIFY_PERMISSION(OPT_P_GENERAL); if (!options->inetd) {
commit 25a422cc60 deprecated --inetd, which is still something we want. Unlike all "usual" deprecated option warnings, we cannot print this at option parsing time, because we need logging to be set up first - otherwise the deprecation warning is sent via the socket (on stdin/stdout) towards the connecting client, totally breaking this mode. (Which is why we want to deprecate it: too special even for us) Signed-off-by: Gert Doering <gert@greenie.muc.de> --- src/openvpn/options.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)