From patchwork Tue Dec 28 23:29:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 2187 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.30.191.6]) by backend41.mail.ord1d.rsapps.net with LMTP id YBhYDOE4zGHvLwAAqwncew (envelope-from ) for ; Wed, 29 Dec 2021 05:30:57 -0500 Received: from proxy7.mail.ord1d.rsapps.net ([172.30.191.6]) by director12.mail.ord1d.rsapps.net with LMTP id +EQMIOE4zGE6BwAAIasKDg (envelope-from ) for ; Wed, 29 Dec 2021 05:30:57 -0500 Received: from smtp39.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.ord1d.rsapps.net with LMTPS id qJbJH+E4zGHHBAAAMe1Fpw (envelope-from ) for ; Wed, 29 Dec 2021 05:30:57 -0500 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: smtp39.gate.ord1d.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: 68055c02-6892-11ec-b599-525400a97bbc-1-1 Received: from [216.105.38.7] ([216.105.38.7:41190] helo=lists.sourceforge.net) by smtp39.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 84/7D-11697-0E83CC16; Wed, 29 Dec 2021 05:30:56 -0500 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1n2WDV-00031f-5Y; Wed, 29 Dec 2021 10:29:57 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n2WDM-00031I-9m for openvpn-devel@lists.sourceforge.net; Wed, 29 Dec 2021 10:29:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version :Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=R8RIj/EzQ5fpEVAjXhcgDNLW8NHrt6ek70kTqI498TI=; b=JIzLjD1IxJvVWkwGmMTWhhq2dL Wsvme8hOVkCQuoLdzIjoPDOnvGX1RLgIP02CtIiZQQY+8e55KxUJvgVDiZfH7I+i/HHeQUdLFLkgM mRH9F7SHw/7qG7gx4o14T/ZkmusAzhqiFFH9cIFTJbjXyN+oW5mmKxdXp/fY5jYB3DlY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To: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=R8RIj/EzQ5fpEVAjXhcgDNLW8NHrt6ek70kTqI498TI=; b=a dqFK5oykbLTFwBhYqs7PqINWFa3RlnMTHLZfotcNG98cFRFx6vTA9cF7OwEgwi/2UYQ4dzgFoZJBO FjU+iyZ8mQNuLbL4Wg+BicjnOaaobg6E3O1b7ByNyGcgHW4NPQsyZa04ZBJofaIlfGNHFIucEQhBA SCTTjA/zZ0+eoyK4=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1n2WDH-00CgnQ-Cm for openvpn-devel@lists.sourceforge.net; Wed, 29 Dec 2021 10:29:48 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.15.2/8.14.9) with ESMTP id 1BTATVAY008952; Wed, 29 Dec 2021 11:29:31 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.15.2/8.14.9/Submit) id 1BTATVYV008951; Wed, 29 Dec 2021 11:29:31 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 29 Dec 2021 11:29:24 +0100 Message-Id: <20211229102924.8901-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22util-spamd-1=2Ev13=2Elw=2Esourceforge=2Ecom=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Camille_Gu=C3=A9rin_=3Cguerinc?= =?unknown-8bit?q?amille56=40gmail=2Ecom=3E_Signed-off-by=3A?= =?unknown-8bit?q?_Camille_Guerin_=3Cguerincamille56=40gmail=2Ecom=3E_Closes?= =?unknown-8bit?q?=3A_OpenVPN/openvpn=23164_---?= =?unknown-8bit?q?_src/openvpn/options=2Ec_=7C_8_+-------_1_file_changed=2C_1?= =?unknown-8bit?q?_insertion=28+=29=2C_7_deletions=28-=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=28-0=2E0_points=2C_6=2E0_re?= =?unknown-8bit?q?quired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_SPF=5FHELO=5FPASS__________SPF=3A_HELO_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= X-Headers-End: 1n2WDH-00CgnQ-Cm Subject: [Openvpn-devel] [PATCH] Removed error message for an option flag not supported with --server-ipv6 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: , Cc: =?utf-8?q?Camille_Gu=C3=A9rin?= Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Camille Guérin Signed-off-by: Camille Guerin Closes: OpenVPN/openvpn#164 Acked-by: Frank Lichtenheld --- src/openvpn/options.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index ac13412a..f59d89cb 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -6870,7 +6870,7 @@ add_option(struct options *options, } } } - else if (streq(p[0], "server-ipv6") && p[1] && !p[3]) + else if (streq(p[0], "server-ipv6") && p[1] && !p[2]) { const int lev = M_WARN; struct in6_addr network; @@ -6893,12 +6893,6 @@ add_option(struct options *options, options->server_ipv6_defined = true; options->server_network_ipv6 = network; options->server_netbits_ipv6 = netbits; - - if (p[2]) /* no "nopool" options or similar for IPv6 */ - { - msg(msglevel, "error parsing --server-ipv6: %s is not a recognized flag", p[3]); - goto err; - } } else if (streq(p[0], "server-bridge") && p[1] && p[2] && p[3] && p[4] && !p[5]) {