From patchwork Fri Aug 11 14:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "flichtenheld (Code Review)" X-Patchwork-Id: 3321 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:ed0c:b0:d7:3b0f:3938 with SMTP id oy12csp1468191dyb; Fri, 11 Aug 2023 08:25:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTeVivvpflsh8VuUo7Uex1XXTPvKE6ePb5B4YHjUNi37rDddch2p0W/UxnHrRtq4bcIWCQ X-Received: by 2002:a17:903:444:b0:1bc:2c79:c6a4 with SMTP id iw4-20020a170903044400b001bc2c79c6a4mr1659177plb.56.1691767502122; Fri, 11 Aug 2023 08:25:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691767502; cv=none; d=google.com; s=arc-20160816; b=h91th5eMH/V/v7ploOJnydjCy/nISRO5eaGBKBfS6HrULWOi0B5P410jTgcj0i+H1Q rj+ExvJBg2M3plLC5EzQM0U4W/xndFazJhq27Zvz2qdgW1sjXi4bXH1VhmUqAlHQ0tCO MvZafvnhszvXO14SHVj0OqjjTGsTHwAXmO+B7NjIneAF5MYnBYXxhp3Yi436nZoDMpJG GtbjdA0VySnmK7PTETwSA40yYOIm1BcCDC4IKvkVNSMhyZHOCyGA2jaHm/V1vQy4xTQa NGaoybJ1Ol6zrDhtRpXr8RHm/hewJsJqvDIs/ByG9UoulxOsqEWPCQj+yIZ8jsIpgnWI W8tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:in-reply-to:auto-submitted:to :date:from:dkim-signature:dkim-signature:dkim-signature; bh=p1uW6pT4xJ5bV6nE3arIsWrO0IaoNzV478xa43d/Nmw=; fh=ysT/hl/yvDoNnfL18dqadIfjnnbWonLve035L4MJ6Tg=; b=CMlz413XzqqBd0OWz/9n7bjrQ2mz4AQIs2WmEqixslgdhGVuinRZANtF6LSiSJa6Jz U6elUr+TUi52KDkVmH4+C1FUaAmfYX+A/nBMAXOda3Cz03Ukl7lCkTfyVj0F0xb/RGq+ iKht1oMBQEasrrh136UZtw7U1qHJTN+Py1IIpCeHoFIYBgoAC2B4VEjpMYvi4QsiH/Af b013YER28j6On+XTBrdtGPNpWemhU80KbkPa+jGB8NkPveB7rD3UnJglWApTbEi5ctjh AaMfi7BJ13MoIwnFYHxsJtxiGho7P06B+Re9bgNpG2+h1KxHkrH1kFEc2OicWhneft13 ivlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=RA9K2tAu; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Me5IRuNm; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=AbBG7WAe; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id a5-20020a170902ecc500b001b88997ababsi3620032plh.412.2023.08.11.08.25.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Aug 2023 08:25:02 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=RA9K2tAu; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Me5IRuNm; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=AbBG7WAe; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1qUTzp-0008UI-Co; Fri, 11 Aug 2023 15:24:13 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qUTzn-0008UC-Pq for openvpn-devel@lists.sourceforge.net; Fri, 11 Aug 2023 15:24:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:In-Reply-To:Subject:List-Unsubscribe:List-Id: Cc:To:Date:From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Help:List-Subscribe :List-Post:List-Owner:List-Archive; bh=gJgXWq4aIsBbBoaczCDYkJpg8Ob7pz2YCCcTSCIJD8A=; b=RA9K2tAuf+fsngqr9RsbdU2Fxh LXykOLYwD/0nAZbTGKOotc+xgRdF1VYFPsuqM7PN1F+upHAzEOcn2JRrT56nQtgUr1uiVFz8N5YXP DeGnn/ajVPS7OJ8tuh/fY5Jcm0NmlCYrwRHYNzEb3UrPqZ2u/6sjLO7TL0dYl1DhrX0A=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:In-Reply-To:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From: Sender:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=gJgXWq4aIsBbBoaczCDYkJpg8Ob7pz2YCCcTSCIJD8A=; b=M e5IRuNmnuhJofQ75fDylVe3wu3JMtKTINDQY1W8RxYeTA1br7Z5+I6tkktmR4Y8o2jSMxQzCZQvvd YW6Pf2CvuZmbDCQcBKjimfk7izG6KReaHZz3IJhmjXmrGyot1NuuYuACtQtn0lTwoP4D48NWyfB2x 1H87pRj+SNiHB8Pg=; Received: from mail-lj1-f169.google.com ([209.85.208.169]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qUTzi-002cga-0g for openvpn-devel@lists.sourceforge.net; Fri, 11 Aug 2023 15:24:11 +0000 Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2b9b50be31aso32269001fa.3 for ; Fri, 11 Aug 2023 08:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1691767439; x=1692372239; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:in-reply-to:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=gJgXWq4aIsBbBoaczCDYkJpg8Ob7pz2YCCcTSCIJD8A=; b=AbBG7WAe+g65WtwdzkVmumaBN/DCHHBNcjrIB5/GqdaaZNadFOU99HtNNiEI7ze+df WDx1/iwAgyKYKJJIpAk5hOqlTvkQHYRDciESq+JcyuLe8w5cG196w9gFgEh1m2ubE5Aj OCiJD6h8NbALUJFU16i+yMDCufxUyJ/neE/4CSBcjVCTgg9XgnHiw8LqUdhsTOpQqC4C VaZqJj0Eg+9P2PE2nh9iAO4Ij8w2WKFqq0ODfMjKEzjRA81KLLlnOFunyMyKZ9NBpPka xxUUSJz+D5GK5/J/hT9k0eAI4/v75wrgHfP1ltiGS3HjQOyLcFo6jIQrTied8dN81pJh BGPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691767439; x=1692372239; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:in-reply-to:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gJgXWq4aIsBbBoaczCDYkJpg8Ob7pz2YCCcTSCIJD8A=; b=X7FycTYsWi7wjQ02jMYgxuzNPp+ME1KnnJ/ItbPjhgQhMgNhiqtdE60RlYmoz5pWzX oe1X0JTW6zs4fAMFMGZDItT5+4Cs8Ui7bbaF92iabo5CZjeUurclHhHOqbqJ89RR6ops ewlK/1WZV9OUrdg0p8DVW9n+MS4zzJa6hu9/1OlmZyCNWWbltXOoAtDRyB6fofEUutTN YffpFg0jmNz5nqMpZfGu4jfjIgkPFESMYxBTj8E3HTqN89hyrvOxDJQ8GaB5hlN+UjQr jnhrmJqRph32ubHruyKQ469NmVN9ulouDBeE7PJj8Itm50jPs7RVOMLuUH4aSbIzp0AE c6fA== X-Gm-Message-State: AOJu0Yyar1YCb2/Iclr4vxs3p1A6S5kBk015dHczuC9+cdNHUqjn3w8Y D+Sj6AltRQ22Qcu43QeqEPX2tsJFyFMWrxVNJj0= X-Received: by 2002:a05:6512:3b9a:b0:4fe:df7:bcf1 with SMTP id g26-20020a0565123b9a00b004fe0df7bcf1mr1860113lfv.57.1691765571779; Fri, 11 Aug 2023 07:52:51 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id n12-20020a7bcbcc000000b003fe557829ccsm8285806wmi.28.2023.08.11.07.52.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 07:52:51 -0700 (PDT) From: "cron2 (Code Review)" X-Google-Original-From: "cron2 (Code Review)" X-Gerrit-PatchSet: 2 Date: Fri, 11 Aug 2023 14:52:50 +0000 To: flichtenheld , plaisthos Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset X-Gerrit-Change-Id: I9f9d0f0d5ab03f8cdfd7ba7200f2d56613cc586d X-Gerrit-Change-Number: 320 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: f7c8cc092b8b6f5659cf8abd8d8624fc16f3dda2 In-Reply-To: References: Message-ID: <882978641c96477f108b1c7397b5a36901ea9f5d-EmailReplacePatchSet-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.0 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/320?usp=email ) The following approvals got outdated and were removed: Code-Review+2 by plaisthos Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.169 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.169 listed in wl.mailspike.net] 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1qUTzi-002cga-0g Subject: [Openvpn-devel] [XS] Change in openvpn[master]: options: Do not hide variables from parent scope 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: , Reply-To: arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1772669982005465295?= X-GMAIL-MSGID: =?utf-8?q?1773946800310842345?= cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/320?usp=email ) The following approvals got outdated and were removed: Code-Review+2 by plaisthos Change subject: options: Do not hide variables from parent scope ...................................................................... options: Do not hide variables from parent scope msglevel hides the function parameter of the same name, which could lead to confusion. Use a unique name. Change-Id: I9f9d0f0d5ab03f8cdfd7ba7200f2d56613cc586d Signed-off-by: Frank Lichtenheld Acked-by: Lev Stipakov Message-Id: URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26902.html Signed-off-by: Gert Doering --- M src/openvpn/options.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/20/320/2 diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 90d85be..d168163 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -9476,24 +9476,24 @@ else { int i; - int msglevel = msglevel_fc; + int msglevel_unknown = msglevel_fc; /* Check if an option is in --ignore-unknown-option and * set warning level to non fatal */ for (i = 0; options->ignore_unknown_option && options->ignore_unknown_option[i]; i++) { if (streq(p[0], options->ignore_unknown_option[i])) { - msglevel = M_WARN; + msglevel_unknown = M_WARN; break; } } if (file) { - msg(msglevel, "Unrecognized option or missing or extra parameter(s) in %s:%d: %s (%s)", file, line, p[0], PACKAGE_VERSION); + msg(msglevel_unknown, "Unrecognized option or missing or extra parameter(s) in %s:%d: %s (%s)", file, line, p[0], PACKAGE_VERSION); } else { - msg(msglevel, "Unrecognized option or missing or extra parameter(s): --%s (%s)", p[0], PACKAGE_VERSION); + msg(msglevel_unknown, "Unrecognized option or missing or extra parameter(s): --%s (%s)", p[0], PACKAGE_VERSION); } } err: