From patchwork Tue Aug 14 19:15:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 450 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id HK2ECZq3c1ufSwAAIUCqbw for ; Wed, 15 Aug 2018 01:18:18 -0400 Received: from proxy3.mail.ord1d.rsapps.net ([172.30.191.6]) by director12.mail.ord1d.rsapps.net (Dovecot) with LMTP id aVj6C5q3c1vXUgAAIasKDg ; Wed, 15 Aug 2018 01:18:18 -0400 Received: from smtp33.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.ord1d.rsapps.net with LMTP id uOZaH5q3c1snCgAA7WKfLA ; Wed, 15 Aug 2018 01:18:18 -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: smtp33.gate.ord1c.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: 9e000460-a04a-11e8-b5ef-54520067fec4-1-1 Received: from [216.105.38.7] ([216.105.38.7:14373] helo=lists.sourceforge.net) by smtp33.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id F1/39-23898-997B37B5; Wed, 15 Aug 2018 01:18:18 -0400 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.90_1) (envelope-from ) id 1fpoB4-0000H8-Mx; Wed, 15 Aug 2018 05:17:02 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1fpoB2-0000Gg-IP for openvpn-devel@lists.sourceforge.net; Wed, 15 Aug 2018 05:17:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type: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=SDbuyPdCrFZqymNJtPHObnqVI0QK5G1k+YAmX/6/tFU=; b=CpHpdi/m0QEy/1yR2Ngz5RbICs lZ9pBWlyD6ZenJlEOJrzt6IVNmiJCZcxbCTf2lWOsf627CVGRLIl+0Tpp61VsPLIBYEVrmqH9WFnA PPxa7LND2aNLAueVoy7JVtSMrVKWMaeh5NySjZsqMO+EJ8lcAR11INbN8ozwwIMbqLEY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Type: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=SDbuyPdCrFZqymNJtPHObnqVI0QK5G1k+YAmX/6/tFU=; b=IcnJDyOuFRCESggkDOHwUrXhXI orJMhH3zULLGk2Er0dWR9ggBDHgIq2Uapyw/+TW+oEvNW4FpDau8MZgGEMyTT5fcF4U9FkvhdhPN7 TOlbKbMQxYiRMSs3WM2u/+KljE9jISK1EA3bH9kknILIhUIHS0j9RCdamdUd0gL2j0Sk=; Received: from s2.neomailbox.net ([5.148.176.60]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1fpoB0-000M1Z-7A for openvpn-devel@lists.sourceforge.net; Wed, 15 Aug 2018 05:17:00 +0000 From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Wed, 15 Aug 2018 13:15:40 +0800 Message-Id: <20180815051540.25118-1-a@unstable.cc> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [5.148.176.60 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1fpoB0-000M1Z-7A Subject: [Openvpn-devel] [PATCH] ssl_verify: define label only when required 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: , Cc: Antonio Quartulli MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox The "cleanup" label in ssl_verify.c:verify_user_pass_plugin() is used only when PLUGIN_DEF_AUTH is defined, therefore make the label definition dependent on the same define. At the moment, gcc throws an error for unused label if PLUGIN_DEF_AUTH is not defined. Signed-off-by: Antonio Quartulli --- src/openvpn/ssl_verify.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c index 61872251..9dfe23f8 100644 --- a/src/openvpn/ssl_verify.c +++ b/src/openvpn/ssl_verify.c @@ -1220,7 +1220,9 @@ verify_user_pass_plugin(struct tls_session *session, const struct user_pass *up, msg(D_TLS_ERRORS, "TLS Auth Error (verify_user_pass_plugin): peer provided a blank username"); } +#ifdef PLUGIN_DEF_AUT cleanup: +#endif return retval; }