From patchwork Tue Aug 4 20:25:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1348 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id IAa2N1dRKl+AOgAAIUCqbw for ; Wed, 05 Aug 2020 02:27:35 -0400 Received: from proxy5.mail.ord1d.rsapps.net ([172.30.191.6]) by director8.mail.ord1d.rsapps.net with LMTP id cKymN1dRKl/abAAAfY0hYg (envelope-from ) for ; Wed, 05 Aug 2020 02:27:35 -0400 Received: from smtp22.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.ord1d.rsapps.net with LMTP id kLBfN1dRKl8xbwAA8Zzt7w ; Wed, 05 Aug 2020 02:27:35 -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: smtp22.gate.ord1d.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 (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: c01440ac-d6e4-11ea-beba-5254001a15c2-1-1 Received: from [216.105.38.7] ([216.105.38.7:59550] helo=lists.sourceforge.net) by smtp22.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id E4/CD-19984-7515A2F5; Wed, 05 Aug 2020 02:27: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 1k3Csw-0004zR-8Q; Wed, 05 Aug 2020 06:26:46 +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 1k3Csv-0004zK-2e for openvpn-devel@lists.sourceforge.net; Wed, 05 Aug 2020 06:26:45 +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=w7PG8Gk7i9UQfxsstBT25MFHJUJkNXaL2ECMjknay7w=; b=Qp0z0ItW9NswoRNGl2Vwmm3QQi GQG5PI3Z06sEW5r/KHecMTsf+gYKaL3K3upHE4LIkUPi/htXBlc1CrenPKxYBbRJK7ISYy4Bar6A+ Q03+Em2l/HfRw5/OxZNEg1GLlfbVZUGCjkqqFJjcQl8K9MHzKLSZczGjooiUYKFbpIfc=; 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=w7PG8Gk7i9UQfxsstBT25MFHJUJkNXaL2ECMjknay7w=; b=m jREAlqYuf39k9AXpWjQbpBLZxadA8xhipCLWk09oxJ75cJOvdKYUBq2xiBYSUO91WJFsqhJuYxIQY Z1XuuSiG5vFCMKZdKbqvfRMjZiQfDIB8oXogJ7yZXcxudczJAPHiXi1zuwScMOypVXVnVt9Jlb8Y8 J7NBUSquLOUl6YBY=; Received: from mail-lf1-f66.google.com ([209.85.167.66]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1k3Cst-00AsMo-6Y for openvpn-devel@lists.sourceforge.net; Wed, 05 Aug 2020 06:26:45 +0000 Received: by mail-lf1-f66.google.com with SMTP id i19so23643752lfj.8 for ; Tue, 04 Aug 2020 23:26:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=w7PG8Gk7i9UQfxsstBT25MFHJUJkNXaL2ECMjknay7w=; b=AEFO+Jeh43xF7fsg37Cg2qUSqgLL/23tiqeBHccSjkPLb8QjClUuzYz6OLipZji+mK CahBQ33Y+zRZpWuOPtqRcluFCpbQP11j1P/1rd8WovUzDUXWy5hkoXoV/uiJ3yZqFlOD m/pOfb+9xgc8EXlVh0hFfbpjKia2R+I3NkuQbkhkpKN72Ol/mFJVIC2Me8V9M83QRk7V YjzWBWeJT/yivwE0fYzpbSVPmjIIvSSeH6bXUGlbNTRPFktjFpFAW6fbp41/VyjuQ9C1 T9fIVU35UB6q6GPWSnkzmN404ybIJMs41wmCIA4sDwfhxS1gkZrvkRvBdab6lcRnpHAT azgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=w7PG8Gk7i9UQfxsstBT25MFHJUJkNXaL2ECMjknay7w=; b=RyevgDdEddqayd+pGiXutxMpwL92qaJJVO7CM3DZYZ08R3cuGM/CP0lI2659wYFvEE NgFVkwaRvphnB9TRjuVsK/qWiUkDHbPrkqIUKzYiK5ltY79X50l8lu3qh8PaJ/4YL6Fj OneMambMlsvqyEzcsbbl/uYmO8Xz5zhFRfhZErj5FYNb4ZSXTLpY33izbA50oBMM++LY wwpXWjC2PHMg3h3QKV1zvOgKC1jcto2xpjYLI1QxmpxQhjMhk8LoW+WLeic41U3OU7tT qkKApL5ZOYJRxWAEjWlFX7UY6LsSJuI4UA1D+jc+dXFjF+xG1i/tbLlCzAL7CX6PU+hq P+Kw== X-Gm-Message-State: AOAM531W+zLPYkRW3zV8g/44CSxyjvyQbhpIdLKETvM3iU81y5OX++CG n3L+aCitUUWgfiq2RQafWzUGaJPq X-Google-Smtp-Source: ABdhPJyP7FRaXMwGyjJ2ArOzjfCspKdN2ICG0vmjAJwKTitxUJJfvDJVENm9ALuzcAqE5tE3BAhsLg== X-Received: by 2002:a19:41d7:: with SMTP id o206mr831094lfa.115.1596608788980; Tue, 04 Aug 2020 23:26:28 -0700 (PDT) Received: from ip-172-31-43-117.eu-north-1.compute.internal (ec2-13-48-107-201.eu-north-1.compute.amazonaws.com. [13.48.107.201]) by smtp.gmail.com with ESMTPSA id k84sm676834lfd.90.2020.08.04.23.26.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2020 23:26:28 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Wed, 5 Aug 2020 06:25:48 +0000 Message-Id: <20200805062548.38082-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.66 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.167.66 listed in wl.mailspike.net] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1k3Cst-00AsMo-6Y Subject: [Openvpn-devel] [PATCH] Fix compilation with --disable-lzo and --disable-lz4 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 struct compress_options is defined under USE_COMP, therefore compilation fails when it is referenced without that define. Since function show_compression_warning, which uses aforementioned struct, is only called under USE_COMP, it is safe to wrap its definition under USE_COMP, which fixes compilation issue. Signed-off-by: Lev Stipakov 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 bc256b18..1c246f4b 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -5085,6 +5085,7 @@ set_user_script(struct options *options, #endif } +#ifdef USE_COMP static void show_compression_warning(struct compress_options *info) { @@ -5103,6 +5104,7 @@ show_compression_warning(struct compress_options *info) } } } +#endif static void add_option(struct options *options,