| Message ID | 20220407201411.22486-1-a@unstable.cc |
|---|---|
| State | Accepted |
| Headers |
Return-Path: <openvpn-devel-bounces@lists.sourceforge.net> Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.31.255.6]) by backend41.mail.ord1d.rsapps.net with LMTP id YMS3KHtST2IUZgAAqwncew (envelope-from <openvpn-devel-bounces@lists.sourceforge.net>) for <patchwork@openvpn.net>; Thu, 07 Apr 2022 17:07:07 -0400 Received: from proxy3.mail.iad3b.rsapps.net ([172.31.255.6]) by director8.mail.ord1d.rsapps.net with LMTP id iKTuOXtST2LxMwAAfY0hYg (envelope-from <openvpn-devel-bounces@lists.sourceforge.net>) for <patchwork@openvpn.net>; Thu, 07 Apr 2022 17:07:07 -0400 Received: from smtp38.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.iad3b.rsapps.net with LMTPS id 4NU+M3tST2JkIgAAM8Wetg (envelope-from <openvpn-devel-bounces@lists.sourceforge.net>) for <patchwork@openvpn.net>; Thu, 07 Apr 2022 17:07:07 -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: smtp38.gate.iad3b.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=unstable.cc X-Suspicious-Flag: YES X-Classification-ID: ae394b1c-b6b6-11ec-8d84-5254006f0979-1-1 Received: from [216.105.38.7] ([216.105.38.7:40468] helo=lists.sourceforge.net) by smtp38.gate.iad3b.rsapps.net (envelope-from <openvpn-devel-bounces@lists.sourceforge.net>) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 11/BC-22704-B725F426; Thu, 07 Apr 2022 17:07:07 -0400 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 <openvpn-devel-bounces@lists.sourceforge.net>) id 1ncZK1-00080h-0U; Thu, 07 Apr 2022 21:05:42 +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 <a@unstable.cc>) id 1ncZJz-00080W-LQ for openvpn-devel@lists.sourceforge.net; Thu, 07 Apr 2022 21:05: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:Cc:To:From:Sender:Reply-To: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=ZkTSJJ8ZEsYP7z77jt784BbygikwGWDdeNj9YqoSzeE=; b=m1hs7L24V6LC1G7V05B43/Pr4E 762HBZ4F0a12ia4W6fD+/jtzDnI+JBNJHElTCESUwOmplkt88NAH4JLnBYgpufjMxFAu+jHKEl7I9 8NL5dsc/KI3K/+g7RS3kRg7ZYEOGcVZK+aT6qL/wUxv+f5ma3XAyBsC0slkDaI2X4WS8=; 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:Cc:To:From :Sender:Reply-To: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=ZkTSJJ8ZEsYP7z77jt784BbygikwGWDdeNj9YqoSzeE=; b=B ojNutyKucmzThm3L7zCNdzyTjB5QDcuCCNxCLUMfgTDo2M3+eHLU78GnPUih57YNk/CDtkNrBUvVw 7iiDXXD38MSb76HaIOJeDo7nTvJ0UizQzzdQzgdi/wPEhEoisQPDTESqyfGa8IH19xaucdmm8EQXc QlrlURTJJfsXurFE=; Received: from s2.neomailbox.net ([5.148.176.60]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1ncZJy-0003ak-Iz for openvpn-devel@lists.sourceforge.net; Thu, 07 Apr 2022 21:05:40 +0000 From: Antonio Quartulli <a@unstable.cc> To: openvpn-devel@lists.sourceforge.net Date: Thu, 7 Apr 2022 22:14:11 +0200 Message-Id: <20220407201411.22486-1-a@unstable.cc> MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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: openvpn_execve_check() expects a set of flags as third argument and not a loglevel. For this reason, if no FATAL behaviour is expected, we should simply pass 0. openvpn_execve_check() will then pick t [...] Content analysis details: (-0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1ncZJy-0003ak-Iz Subject: [Openvpn-devel] [PATCH] networking_iproute2: don't pass M_WARN to openvpn_execve_check() X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: <openvpn-devel.lists.sourceforge.net> List-Unsubscribe: <https://lists.sourceforge.net/lists/options/openvpn-devel>, <mailto:openvpn-devel-request@lists.sourceforge.net?subject=unsubscribe> List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=openvpn-devel> List-Post: <mailto:openvpn-devel@lists.sourceforge.net> List-Help: <mailto:openvpn-devel-request@lists.sourceforge.net?subject=help> List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/openvpn-devel>, <mailto:openvpn-devel-request@lists.sourceforge.net?subject=subscribe> Cc: Antonio Quartulli <a@unstable.cc> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox |
| Series |
[Openvpn-devel] networking_iproute2: don't pass M_WARN to openvpn_execve_check()
|
|
Commit Message
Antonio Quartulli
April 7, 2022, 10:14 a.m. UTC
openvpn_execve_check() expects a set of flags as third argument and not
a loglevel. For this reason, if no FATAL behaviour is expected, we
should simply pass 0. openvpn_execve_check() will then pick the
appropriate loglevel on its own.
Signed-off-by: Antonio Quartulli <a@unstable.cc>
---
src/openvpn/networking_iproute2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Comments
Acked-by: Gert Doering <gert@greenie.muc.de> Good catch :-) Your patch introduced a whitespace change on the second line. I asked uncrustify, uncrustify said "previous indent is correct", so only changing the first line. Your patch has been applied to the master and release/2.5 branch. commit 545f6bdea30e04a09b118c4e1faf6523544fd935 (master) commit 113b6c4192ecb927997b187de023aec71712f312 (release/2.5) Author: Antonio Quartulli Date: Thu Apr 7 22:14:11 2022 +0200 networking_iproute2: don't pass M_WARN to openvpn_execve_check() Signed-off-by: Antonio Quartulli <a@unstable.cc> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20220407201411.22486-1-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg24090.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/src/openvpn/networking_iproute2.c b/src/openvpn/networking_iproute2.c index 3ca2bb35..02fd3cb6 100644 --- a/src/openvpn/networking_iproute2.c +++ b/src/openvpn/networking_iproute2.c @@ -105,8 +105,8 @@ net_addr_ll_set(openvpn_net_ctx_t *ctx, const openvpn_net_iface_t *iface, iproute_path, MAC_PRINT_ARG(addr), iface); argv_msg(M_INFO, &argv); - if (!openvpn_execve_check(&argv, ctx->es, M_WARN, - "Linux ip link set addr failed")) + if (!openvpn_execve_check(&argv, ctx->es, 0, + "Linux ip link set addr failed")) { ret = -1; }