From patchwork Thu Oct 21 00:50:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maximilian Fillinger X-Patchwork-Id: 2045 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director15.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id aF2jLZhUcWErbwAAIUCqbw (envelope-from ) for ; Thu, 21 Oct 2021 07:52:56 -0400 Received: from proxy16.mail.iad3b.rsapps.net ([172.31.255.6]) by director15.mail.ord1d.rsapps.net with LMTP id mBdaLZhUcWEMLQAAIcMcQg (envelope-from ) for ; Thu, 21 Oct 2021 07:52:56 -0400 Received: from smtp34.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy16.mail.iad3b.rsapps.net with LMTPS id SBaxJ5hUcWGGVQAAPj+4aA (envelope-from ) for ; Thu, 21 Oct 2021 07:52:56 -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: smtp34.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; dkim=fail (key not found in DNS) header.d=foxcrypto.com; dmarc=fail (p=none; dis=none) header.from=foxcrypto.com X-Suspicious-Flag: YES X-Classification-ID: 6de0c52a-3265-11ec-a204-5254005e8ddb-1-1 Received: from [216.105.38.7] ([216.105.38.7:32838] helo=lists.sourceforge.net) by smtp34.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 9B/92-02284-89451716; Thu, 21 Oct 2021 07:52:56 -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.92.3) (envelope-from ) id 1mdWc2-0007ZX-PQ; Thu, 21 Oct 2021 11:51:58 +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.92.3) (envelope-from ) id 1mdWc1-0007ZP-AV for openvpn-devel@lists.sourceforge.net; Thu, 21 Oct 2021 11:51:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:MIME-Version:Message-ID:Date:Subject: CC:To:From:Sender:Reply-To:Content-Transfer-Encoding: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=G6o7YVjhcqhMl8o9s+gdofxqybQbAWMsFLf1LV88/HU=; b=Y6vanp9xez51rfUDiOaZdgceIo 5g0sp3UkhU47xr+9so67StVB/5cPqjmPkoj1qBPUzIuRAejmGiX6g7VDjLf0rWY26uJARy6RhpERq ovGN7XNFplmzZzwLY+jC7YaAKfYkWsOR9zILfCDkgpWmRGEDZIQIfLA/9Wb367u0adx8=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From:Sender: Reply-To:Content-Transfer-Encoding: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=G6o7YVjhcqhMl8o9s+gdofxqybQbAWMsFLf1LV88/HU=; b=l pM73GD0IWHjRczigCmkpbIeq28egx/ZL4Ux4zZcacFfneL/+3ElAVe8AfVj2TBqUku3f3REp8ATYM TuhLqvPabNqXgEZJ3NrRIKM0oh+JaeEy53D27Wc2VDSH+P7zPzON+dFkbJXUImXFZyXjD0BhZTwU9 8KbZ3SlALpimuem8=; Received: from nl-dft-mx-01.fox-it.com ([178.250.144.135]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1mdWbr-00A7eW-H6 for openvpn-devel@lists.sourceforge.net; Thu, 21 Oct 2021 11:51:57 +0000 From: To: Date: Thu, 21 Oct 2021 13:50:37 +0200 Message-ID: <20211021115037.27056-1-maximilian.fillinger@foxcrypto.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-ClientProxiedBy: FOXDFT1EX01.FOX.local (10.0.0.129) To FOXDFT1EX01.FOX.local (10.0.0.129) X-FE-Policy-ID: 13:3:2:SYSTEM DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; d=foxcrypto.com; s=NL-DFT-MX-01; c=relaxed/relaxed; h=from:to:cc:subject:date:message-id:mime-version:content-type; bh=G6o7YVjhcqhMl8o9s+gdofxqybQbAWMsFLf1LV88/HU=; b=70z0BppYpAfeivHCmIkuyMG5bkzn/PXLBsqGuca72F8ifIchOpzeOZq554R68tTTyh8NdDHKFUCN seBLR2IFxnAI8KLLA/cbLAdUsaz54cW3WVCWfwYly7h8cWeif+ewkzpSi9LuijywGw2Auvk9epzt ib3MzeD/M3VDLyTdI4W1PjiZ23iKuqr6xg7MHhcrWA2vugo37cjgsWRqMOlNptZ83d1dapC3E2JZ o5mGYVCoCNAc83JeqrPzC4Xz8xrSLUX25DjdYE2Q5H5zE1HeznJ12QQzpLmDSYYNzKP0GXA2dw7R tNV/Nv6SMZrb3L1QCHa5iCnG4PeABlzy++Z/PQ== 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: From: Max Fillinger When building with both --disable-lz4 and --disable-lzo, the function comp_non_stub_enabled and various flags are not defined. One of the places where it is used in options.c was not put behind an #if [...] Content analysis details: (0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 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: foxcrypto.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.1 DKIM_INVALID DKIM or DK signature exists, but is not valid X-Headers-End: 1mdWbr-00A7eW-H6 Subject: [Openvpn-devel] [PATCH] Fix build with compression disabled 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 From: Max Fillinger When building with both --disable-lz4 and --disable-lzo, the function comp_non_stub_enabled and various flags are not defined. One of the places where it is used in options.c was not put behind an #ifdef, which caused compilation to fail. Signed-off-by: Max Fillinger Acked-by: Gert Doering --- src/openvpn/options.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index ed2dcd53..4a5db8a6 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3205,6 +3205,7 @@ options_set_backwards_compatible_options(struct options *o) o->enable_ncp_fallback = true; } +#ifdef USE_COMP /* Compression is deprecated and we do not want to announce support for it * by default anymore, additionally DCO breaks with compression. * @@ -3215,6 +3216,7 @@ options_set_backwards_compatible_options(struct options *o) { o->comp.flags = COMP_F_ALLOW_STUB_ONLY|COMP_F_ADVERTISE_STUBS_ONLY; } +#endif } static void