From patchwork Fri Mar 24 08:38:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3164 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7301:10f:b0:b2:6796:f29 with SMTP id gj15csp338364dyb; Fri, 24 Mar 2023 01:39:13 -0700 (PDT) X-Google-Smtp-Source: AKy350b2XV+9Fev+FIBncvusKfLM04st4hOe4T7pT/JObabhXjsyRWYMELd5qdeplV8FMKmHeLjL X-Received: by 2002:a17:903:294c:b0:19f:1871:3dcd with SMTP id li12-20020a170903294c00b0019f18713dcdmr1639314plb.5.1679647152840; Fri, 24 Mar 2023 01:39:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679647152; cv=none; d=google.com; s=arc-20160816; b=BTVJV8m7DfRkc9b3W0qdsWSpRnohEa1KNFcURO1qszEAPjRxvEkuCeNdxNEhnKC7K1 gtd2E86SL5htlUTFiji/t87k9zgq+wCKwcznx4eNsI1nxfVa6Uwk/D+NxfWHuwrp527K kyp/XNgrqBjAe2bhfwytaTCBl36+yrycwRnxs13dexjMh2Zre0thXxpfyLkJbHDCpSat R6TCAcEpaHATPA51TErweRwX3g1/Z1YbGZIJ6daNU8H/c2rLeiTuqDw85HsYKtWy9ifg IyVC79LJ+9AuDbEB774z9mlL4BGeDCs0gslZQFkhml9BxDSi6QmmvlUQ/k/65oWL3tI0 A1tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature; bh=jXMe94id1Bg2XDRG30kss37T0Bdl2cNBJSc7vCNc9ys=; b=dbjJXQKgEkUjnA+cIC8Prr8L0BaUOf7rAHjtRBvhJjjzXFSh1BrbwnpszwyXztGF2W miH26nyHo8fexGFpUWZAkmU35j5IviSM6NpeEwRlG8s+oteLfD34dUd8lCi9epzSqpIk QlytF0UterjgD67bkb8xhviuAaQugcu9B7asbzACgGmW7RnmCgzdlgumqXM4I8YvP9Iz Bi5Po80FjhUeOMdZsPEBbwjyK1plF1Ov0ZlR/d2GHyMS9oF/a1bkD0diYwXpwuQ35USu fmEktHq7Rpr3rZfPe4CgtyIvx91PtMJf7LQQ9y+eFmREQuDtbn9pf33BmRPMhlA7xmap XXiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=EfwMEcjK; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=hDJ10T64; 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 Received: from lists.sourceforge.net ([216.105.38.7]) by mx.google.com with ESMTPS id k17-20020a170902c41100b0019a96125cd7si24257669plk.332.2023.03.24.01.39.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Mar 2023 01:39:12 -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=EfwMEcjK; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=hDJ10T64; 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 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pfcwL-0006eG-1W; Fri, 24 Mar 2023 08:38:27 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pfcwJ-0006e9-DU for openvpn-devel@lists.sourceforge.net; Fri, 24 Mar 2023 08:38:25 +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=mtHS0fgLauVIFtS0VN7cEOEhU/Dpf4b8GcRuOQjzRR4=; b=EfwMEcjKJ56XjE9nFHNTRs+e0i wbtycDdt0ErePXiS1pVdITo/4fgzKhHiJe65rPKY5dIV2KyLS7pTyS9m//5ySsV9O2buUgSNnsxVI tY9YW2wHBUxg8pbD+Vol3i9M/Y2t6R0e+NiL2GSEN1gCduc8u01iy2u32hbLMXLIYwL0=; 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=mtHS0fgLauVIFtS0VN7cEOEhU/Dpf4b8GcRuOQjzRR4=; b=h DJ10T64BK77Y3rdCmVqbXXFD5+VKuydDiBZbjwjRIJF9TSneGzDok4yEhr+72WoCpmrm9SdZ7kmmE TqcL3a0/f0oZ/+mD8jq4OnC/ys3ahrLWg+dVs3p0htrumMlOtZSKkk1/qzF7jkfYUjGOn8Jh8RH5l c4LWvw6xtCcNGe4k=; Received: from chekov.greenie.muc.de ([193.149.48.178]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pfcwJ-0005UW-EE for openvpn-devel@lists.sourceforge.net; Fri, 24 Mar 2023 08:38:25 +0000 Received: from chekov.greenie.muc.de (localhost [127.0.0.1]) by chekov.greenie.muc.de (8.16.1/8.16.1) with ESMTPS id 32O8cGwQ079445 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Fri, 24 Mar 2023 09:38:16 +0100 (CET) (envelope-from gert@chekov.greenie.muc.de) Received: (from gert@localhost) by chekov.greenie.muc.de (8.16.1/8.16.1/Submit) id 32O8cGle079444 for openvpn-devel@lists.sourceforge.net; Fri, 24 Mar 2023 09:38:16 +0100 (CET) (envelope-from gert) From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Fri, 24 Mar 2023 09:38:16 +0100 Message-Id: <20230324083816.79436-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) 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: The previous commit (e86bc8b2967) breaks compilation if all compression algorithms are disabled (--disable-lz4 --disable-lzo). A later patch in the series would fix this but can not be merged yet. Signed-off-by: Gert Doering --- src/openvpn/options.c | 2 ++ 1 file changed, 2 insertions(+) Content analysis details: (0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1pfcwJ-0005UW-EE Subject: [Openvpn-devel] [PATCH] Fix compilation without compression 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 X-GMAIL-THRID: =?utf-8?q?1761237693055040201?= X-GMAIL-MSGID: =?utf-8?q?1761237693055040201?= The previous commit (e86bc8b2967) breaks compilation if all compression algorithms are disabled (--disable-lz4 --disable-lzo). A later patch in the series would fix this but can not be merged yet. Signed-off-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 435e1ca9..e3d14e94 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3779,8 +3779,10 @@ options_postprocess_mutate(struct options *o, struct env_set *es) /* this depends on o->windows_driver, which is set above */ options_postprocess_mutate_invariant(o); +#ifdef USE_COMP /* check that compression settings in the options are okay */ check_compression_settings_valid(&o->comp, M_USAGE); +#endif /* * Save certain parms before modifying options during connect, especially