From patchwork Fri Jul 24 08:13:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 1333 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.27.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id SEfKHgwlG1/XYgAAIUCqbw for ; Fri, 24 Jul 2020 14:14:36 -0400 Received: from proxy9.mail.iad3a.rsapps.net ([172.27.255.1]) by director10.mail.ord1d.rsapps.net with LMTP id cCqxHQwlG19BLQAApN4f7A (envelope-from ) for ; Fri, 24 Jul 2020 14:14:36 -0400 Received: from smtp8.gate.iad3a ([172.27.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy9.mail.iad3a.rsapps.net with LMTP id 4HI7FwwlG19hYwAAGuSQww ; Fri, 24 Jul 2020 14:14:36 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp8.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=greenie.muc.de X-Suspicious-Flag: YES X-Classification-ID: 876a8b58-cdd9-11ea-b152-525400b8fe03-1-1 Received: from [216.105.38.7] ([216.105.38.7:53280] helo=lists.sourceforge.net) by smtp8.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 35/74-28143-B052B1F5; Fri, 24 Jul 2020 14:14:36 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jz2CU-000676-TX; Fri, 24 Jul 2020 18:13:42 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz2CS-00066v-FJ for openvpn-devel@lists.sourceforge.net; Fri, 24 Jul 2020 18:13:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vi6d4XTuAg3LovTo0h+/PJ1a/aFvnvdeU+GchskVTlg=; b=eVJOCCD50TjzVjauibFx/ov5CV GD2Sy6hpycGiva8mwRGbWOr7064jxWQI5QUvwJn9asL8st4fqI4FGI8E5L9ilL5YDDTjUKlvD4sjY AQ8lYWn0nLlFAJYy31+5dPeNB7Gz8FYZjhidE5kel7aqxwOSldh+8jC5PWowGJOB5c/c=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=vi6d4XTuAg3LovTo0h+/PJ1a/aFvnvdeU+GchskVTlg=; b=B x40SIF+YU5NkIQJuD+cRZFYI9q8Z3V1hn2d261yMOveKCOxYVpir7GUUscdElUq6wa3hxcfvzospR hOpZNWeoRv4XbTX+E19zyTU6EvyRWABi+fH6KBc22gTHY6n56OSVhsvyDRbyHWEOPkoruCe/M4Nqm XxKjHYvmOyAlN2BY=; Received: from vmail1.greenie.net ([195.30.8.66]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jz2CN-007pEb-HF for openvpn-devel@lists.sourceforge.net; Fri, 24 Jul 2020 18:13:40 +0000 Received: from gentoo.ov.greenie.net (gentoo.ov.greenie.net [IPv6:2001:608:0:814:0:0:f000:11]) by vmail1.greenie.net (8.15.2/8.12.11) with SMTP id 06OIDOvl082849 for ; Fri, 24 Jul 2020 20:13:24 +0200 (CEST) Received: (nullmailer pid 19083 invoked by uid 1000); Fri, 24 Jul 2020 18:13:24 -0000 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Fri, 24 Jul 2020 20:13:24 +0200 Message-Id: <20200724181324.19037-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (vmail1.greenie.net [IPv6:2001:608:1:995a:20c:29ff:feb8:10eb]); Fri, 24 Jul 2020 20:13:24 +0200 (CEST) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: muc.de] 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1jz2CN-007pEb-HF Subject: [Openvpn-devel] [PATCH] Repair --inetd X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox 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 Acked-By: Arne Schwabe --- src/openvpn/options.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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) {