From patchwork Fri Jul 5 03:00:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 776 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.27.255.59]) by backend30.mail.ord1d.rsapps.net with LMTP id sGGaNStKH13+egAAIUCqbw for ; Fri, 05 Jul 2019 09:01:31 -0400 Received: from proxy9.mail.iad3a.rsapps.net ([172.27.255.59]) by director7.mail.ord1d.rsapps.net with LMTP id yOGWMitKH12pQwAAovjBpQ ; Fri, 05 Jul 2019 09:01:31 -0400 Received: from smtp51.gate.iad3a ([172.27.255.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy9.mail.iad3a.rsapps.net with LMTP id WEKtKytKH11SMAAAGuSQww ; Fri, 05 Jul 2019 09:01:31 -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: smtp51.gate.iad3a.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=greenie.muc.de X-Suspicious-Flag: YES X-Classification-ID: 0447f1fe-9f25-11e9-b291-525400aaff7b-1-1 Received: from [216.105.38.7] ([216.105.38.7:53106] helo=lists.sourceforge.net) by smtp51.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 4B/1E-05725-F2A4F1D5; Fri, 05 Jul 2019 09:01: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 1hjNoq-0006EL-5y; Fri, 05 Jul 2019 13:00:04 +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 1hjNoo-0006EE-F8 for openvpn-devel@lists.sourceforge.net; Fri, 05 Jul 2019 13:00:02 +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=ibEM3vE5f/kfAXQdJF6GeuPDD3JweevwtGJl3VAuuLE=; b=NmxZQEskOKDj6JTOBSQLZRqRS6 vxcVcA28WD1dEJOZLDR7VZ99yh5L6+UfOHgYH7cPx444Ci2Nw8z54zrm5x10Lmu38uuEF2o7hQZeL kkiMHnS8kwklOGv1yVpHIkoqOKECLbetS5/w5ZEEk2YZ8zQzB0Nf9m2/Rnbl0ZNfrlPI=; 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=ibEM3vE5f/kfAXQdJF6GeuPDD3JweevwtGJl3VAuuLE=; b=F TU9dn2Tl5oroa+fe6TySNlgeyMWhBWSFQemp1aNHmNWIm1c1gUwu2SClntkv4FeCrMyKLU00zJ/bT V7ffPIP7Rbg25rhZHyj8OIqvQOVWEWLeOyWSvDrD1CavNjQ/4ftYqpQi+6RBK1GcIoHjopjberRza WxlNJMlVIR9uv7lU=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1hjNow-006nhG-N0 for openvpn-devel@lists.sourceforge.net; Fri, 05 Jul 2019 13:00:13 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.14.9/8.14.9) with ESMTP id x65D02Zo030787 for ; Fri, 5 Jul 2019 15:00:02 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.14.9/8.14.9/Submit) id x65D02m2030785 for openvpn-devel@lists.sourceforge.net; Fri, 5 Jul 2019 15:00:02 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Fri, 5 Jul 2019 15:00:01 +0200 Message-Id: <20190705130001.30741-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 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: muc.de] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1hjNow-006nhG-N0 Subject: [Openvpn-devel] [PATCH] repair windows builds (2.4) 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 commit 0c1cc8d65539f removed "DWORD len;" from service_enable_dhcp(), but that variable is far from "unused" - breaking compilation. The problem here was that it's a larger "cleanup compiler warnings" patch which was fully correct for master, but this particular function looks different in release/2.4 because the whole iservice call refactoring patch isn't in release/2.4 - so master does not need the DWORD len, but release/2.4 does. More care needed with "warning cleanup"... Signed-off-by: Gert Doering Acked-By: Arne Schwabe --- src/openvpn/tun.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 9b830285..80eaa2c4 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -5374,6 +5374,7 @@ netsh_enable_dhcp(const char *actual_name) static bool service_enable_dhcp(const struct tuntap *tt) { + DWORD len; bool ret = false; ack_message_t ack; struct gc_arena gc = gc_new();