upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Repair --inetd

Browse source 
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>
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>
This commit is contained in:
Gert Doering 2020-07-24 20:13:24 +02:00
parent a7d6977e6e
commit 96d57b0fc5
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/openvpn/options.c
View file

@ -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)
{