From patchwork Fri Sep 27 12:45:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sommerseth X-Patchwork-Id: 837 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id SNg4GomRjl17YQAAIUCqbw for ; Fri, 27 Sep 2019 18:47:37 -0400 Received: from proxy2.mail.ord1c.rsapps.net ([172.28.255.1]) by director7.mail.ord1d.rsapps.net with LMTP id sGfEGYmRjl19RAAAovjBpQ ; Fri, 27 Sep 2019 18:47:37 -0400 Received: from smtp9.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.ord1c.rsapps.net with LMTP id QOCsGYmRjl3WcwAA311kuQ ; Fri, 27 Sep 2019 18:47:37 -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: smtp9.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=fail (p=none; dis=none) header.from=openvpn.net X-Suspicious-Flag: YES X-Classification-ID: cd25c0a2-e178-11e9-9e1b-0026b95bddb7-1-1 Received: from [216.105.38.7] ([216.105.38.7:42840] helo=lists.sourceforge.net) by smtp9.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 96/D1-16273-9819E8D5; Fri, 27 Sep 2019 18:47:37 -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 1iDz0B-0002jF-SM; Fri, 27 Sep 2019 22:46:15 +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 1iDz0A-0002j1-0a for openvpn-devel@lists.sourceforge.net; Fri, 27 Sep 2019 22:46:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=QPbiuJJpOvfz7s3NT3RPvkFvPbhzjJ3imLOuuMAGM+Y=; b=j9lf1ihO4BQucGDOJCiCxEcNuo GJLvd3WKAxnEW/BMUA1agOep2EqKd98JZmKFrA4utE9Qmp/HQudKv0BkQPM8qG1noVs2GhSY7Jcsx aySBu/xge1GZWrxLafabWAL2SSjLm9w5F75Tfsz2Co/uuRB+/yDkNy4IoLKoGi7y2Omw=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=QPbiuJJpOvfz7s3NT3RPvkFvPbhzjJ3imLOuuMAGM+Y=; b=awV2h/yUCDaH+c48RnTBZsBPjR 88jalQOdfF1j2+5mxB/XFm2P1+Ff/smi4Ut/iwGmsXF9wXwhya32MWH2GPK/Zsba2qmqIFwF3BaBZ DUlHfLqcuQd/5UZajc1c4xxNtb+QT6yoBSVeh2m3wVRBKXclkqVEUa/sDXY0BvH+Wz6M=; Received: from mx0.basenordic.cloud ([185.212.44.139]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1iDz08-0096dx-P8 for openvpn-devel@lists.sourceforge.net; Fri, 27 Sep 2019 22:46:13 +0000 Received: from localhost (unknown [IPv6:::1]) by mx0.basenordic.cloud (Postfix) with ESMTP id 4D039837AB4 for ; Fri, 27 Sep 2019 22:46:06 +0000 (UTC) Received: from mx0.basenordic.cloud ([127.0.0.1]) by localhost (winterfell.topphemmelig.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xdn24UywZgG5 for ; Sat, 28 Sep 2019 00:46:04 +0200 (CEST) Received: from zimbra.sommerseth.email (zimbra.sommerseth.email [172.16.33.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx0.basenordic.cloud (Postfix) with ESMTPS id B58B9837A9A for ; Sat, 28 Sep 2019 00:45:49 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zimbra.sommerseth.email (Postfix) with ESMTP id 57AB941EB84D for ; Sat, 28 Sep 2019 00:45:49 +0200 (CEST) Received: from zimbra.sommerseth.email ([127.0.0.1]) by localhost (zimbra.sommerseth.email [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ReiE7FsQTCeM for ; Sat, 28 Sep 2019 00:45:49 +0200 (CEST) Received: from optimus.homebase.sommerseths.net (optimus.homebase.sommerseths.net [10.35.0.233]) by zimbra.sommerseth.email (Postfix) with ESMTPS id 1B70E41EB84C for ; Sat, 28 Sep 2019 00:45:49 +0200 (CEST) From: David Sommerseth To: openvpn-devel@lists.sourceforge.net Date: Sat, 28 Sep 2019 00:45:34 +0200 Message-Id: <20190927224536.27480-2-davids@openvpn.net> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190927224536.27480-1-davids@openvpn.net> References: <20190927224536.27480-1-davids@openvpn.net> 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: openvpn.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1iDz08-0096dx-P8 Subject: [Openvpn-devel] [PATCH 1/3] auth-token: Fix building with --disable-server 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox The final patches of the auth-token hmac support patches had a typo in the P2MP_SERVER fencing breaking --disable-server builds. It used #if instead of #ifdef. While at it, also fix another missing P2MP_SERVER fencing causing the compiler to complain about an unused variable in push.c Signed-off-by: David Sommerseth Acked-by: Gert Doering --- src/openvpn/push.c | 2 ++ src/openvpn/ssl_common.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openvpn/push.c b/src/openvpn/push.c index dc1a536a..49b9d1be 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -39,7 +39,9 @@ #if P2MP +#ifdef P2MP_SERVER static char push_reply_cmd[] = "PUSH_REPLY"; +#endif /* * Auth username/password diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.h index 406601bc..5e21009e 100644 --- a/src/openvpn/ssl_common.h +++ b/src/openvpn/ssl_common.h @@ -530,7 +530,7 @@ struct tls_multi time_t tas_last; #endif -#if P2MP_SERVER +#ifdef P2MP_SERVER /* * An error message to send to client on AUTH_FAILED */