From patchwork Wed Sep 9 05:37:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 1435 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 6LijBvz2WF/yGgAAIUCqbw (envelope-from ) for ; Wed, 09 Sep 2020 11:38:36 -0400 Received: from proxy9.mail.iad3b.rsapps.net ([172.31.255.6]) by director12.mail.ord1d.rsapps.net with LMTP id WMx6Bvz2WF8jNQAAIasKDg (envelope-from ) for ; Wed, 09 Sep 2020 11:38:36 -0400 Received: from smtp31.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy9.mail.iad3b.rsapps.net with LMTPS id AMIzAPz2WF84EgAAC4PSzw (envelope-from ) for ; Wed, 09 Sep 2020 11:38: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: smtp31.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=greenie.muc.de X-Suspicious-Flag: YES X-Classification-ID: 85856b34-f2b2-11ea-888c-52540005277f-1-1 Received: from [216.105.38.7] ([216.105.38.7:48618] helo=lists.sourceforge.net) by smtp31.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 96/71-00523-BF6F85F5; Wed, 09 Sep 2020 11:38:35 -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.90_1) (envelope-from ) id 1kG2AG-0004Ug-DE; Wed, 09 Sep 2020 15:37:40 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kG2AE-0004UZ-Tv for openvpn-devel@lists.sourceforge.net; Wed, 09 Sep 2020 15:37:38 +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=HWYiTGDWs492BhcHrGSG/IxqAatdNkxWrPKI+bSWGKg=; b=Gaf1kdlN8eqel0ekXh2buWTIW7 XKDTAsG90kid8J3TeeoIdjFhNFYoAFriedV5DUi0KtbrGFPHya7iNUfrJCozi5wn6OdBJuRNBE5Dv HMEYluSk0+w0evEEEhmfwFVI16LGpDkjcQH4++84iiwV7OOrUqd9XOCIolIgBSBvFf0g=; 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=HWYiTGDWs492BhcHrGSG/IxqAatdNkxWrPKI+bSWGKg=; b=R 2D0jBsHtR/jcCZP9sTGW/M+U3Ci+g5Y+c2ipgWPpkvQIagU2Pwlq6ba/uIEmwWJsxb0D8C9cwvduz b7/5PLl3O9byjL4br7Jw61QbAlCyhNASzCP8Qyt4rGVNoPsh9RI5RZOkdRkYa2saFy8xxs/b4Bn8/ /YGJHYFvGHdlI6zA=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1kG2A8-000iry-Ef for openvpn-devel@lists.sourceforge.net; Wed, 09 Sep 2020 15:37:38 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.14.9/8.14.9) with ESMTP id 089FbPbE001234 for ; Wed, 9 Sep 2020 17:37:25 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.15.2/8.14.9/Submit) id 089FbPhj001233 for openvpn-devel@lists.sourceforge.net; Wed, 9 Sep 2020 17:37:25 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 9 Sep 2020 17:37:25 +0200 Message-Id: <20200909153725.1158-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 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 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1kG2A8-000iry-Ef Subject: [Openvpn-devel] [PATCH] Fix TUNSETGROUP compatibility with very old Linux systems. 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 Our code works on "very old Linux" (Fedora-1), but needs a #define for TUNSETGROUP to compile. Everything else is there. While at it, fix TUNSETGROUP error message. Reported-By: noloader on Trac Trac: #1152 Signed-off-by: Gert Doering Acked-By: Arne Schwabe --- src/openvpn/tun.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 923131ad..651cb871 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1993,6 +1993,11 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun #ifdef ENABLE_FEATURE_TUN_PERSIST +/* TUNSETGROUP appeared in 2.6.23 */ +#ifndef TUNSETGROUP +# define TUNSETGROUP _IOW('T', 206, int) +#endif + void tuncfg(const char *dev, const char *dev_type, const char *dev_node, int persist_mode, const char *username, const char *groupname, @@ -2032,7 +2037,7 @@ tuncfg(const char *dev, const char *dev_type, const char *dev_node, } else if (ioctl(tt->fd, TUNSETGROUP, platform_state_group.gr->gr_gid) < 0) { - msg(M_ERR, "Cannot ioctl TUNSETOWNER(%s) %s", groupname, dev); + msg(M_ERR, "Cannot ioctl TUNSETGROUP(%s) %s", groupname, dev); } } close_tun(tt, ctx);