From patchwork Tue Oct 10 12:11:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 15 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director4.mail.ord1d.rsapps.net ([172.30.157.10]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id QZtQC9NT3VkKawAAgoeIoA for ; Tue, 10 Oct 2017 19:12:19 -0400 Received: from director4.mail.ord1c.rsapps.net ([172.28.140.4]) by director4.mail.ord1d.rsapps.net (Dovecot) with LMTP id xb1nAdNT3VmTPwAAHDmxtw ; Tue, 10 Oct 2017 19:12:19 -0400 Received: from smtp50.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director4.mail.ord1c.rsapps.net (Dovecot) with LMTP id kygaFylT3VkAYgAAsEL7Xg ; Tue, 10 Oct 2017 19:12:19 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1001-1200-w 0-298-1001-1564-w 0-298-0-10199-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=K/5gJGeI c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=WoUKt_tgeKuBKdJwVhYA:9 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp50.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 756882de-ae10-11e7-9d81-b8ca3a659864-1-1 Received: from [216.34.181.88] ([216.34.181.88:24468] helo=lists.sourceforge.net) by smtp50.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id D0/6A-27082-1D35DD95; Tue, 10 Oct 2017 19:12:17 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gm-0004yX-IC; Tue, 10 Oct 2017 23:11:52 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23gl-0004yL-F8 for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:51 +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:Cc:To:From; bh=7PAE2veS4bMgDf/3WTRd54XFPyXj436ONmopnEL2GXE=; b=LnEMKZDaZjhSJWYX1WsUlv4ZaWlorH3fbY3pbD8OUlt0U4DKqhAlMZnWhtxTujkBLpSmo5MCoc35fSpTGf6uKk3LZW+Arjmd+BDm4qsx/pQsX6w0JHMclxqGUl2g4nc1e86SCH76q2Ej9XePCHahPieV2UcDf4/ZLVk6B37ICeA=; 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:Cc:To:From; bh=7PAE2veS4bMgDf/3WTRd54XFPyXj436ONmopnEL2GXE=; b=hh0otEf21XtFYwOQJBsMuHj/KAMH0MBl5STHRv5cMusJbtf981t0ZQWZ103P9sw+/tff/PrW47eZKYLqj1cHzgjY+n43XoLfUrupw1oPbTtK2JS/JpSXMeOwCcsvFaurhcQCszIDNWFyK0UjKU9vvdea24kXmN5FzjT6FNRzERM=; Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gk-0000yN-HF for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:51 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id 43AE6407B8; Wed, 11 Oct 2017 01:11:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677093; bh=nVGGhrL/IOvBrDGLITWDWeBXJwN37+LlxscX09YdvtM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=USTKsV9rNmibA6hPhDHjSBqRIfZSYcPV44esWGX+6vmTsNXZgz/J2a2AX9riqfq7r eGP/wnDNtxX1CiaWn252RYQoEHFTQlLfqnsZKq8h/AgBr58BXhETby0BR19KAfXQfV o/djiNG0AVpECwR2oRJ/szlf1S5u9bPeWAIdZa8w= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:26 +0200 Message-Id: <20171010231130.6832-9-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> 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 [89.212.80.145 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gk-0000yN-HF Subject: [Openvpn-devel] [PATCH 09/13] Signed/unsigned warnings of MSVC resolved 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 From: Simon Rozman --- src/openvpn/block_dns.c | 2 +- src/openvpnserv/automatic.c | 2 +- src/openvpnserv/common.c | 2 +- src/openvpnserv/interactive.c | 4 ++-- src/openvpnserv/validate.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openvpn/block_dns.c b/src/openvpn/block_dns.c index d43cbcf..f88ba2c 100644 --- a/src/openvpn/block_dns.c +++ b/src/openvpn/block_dns.c @@ -370,7 +370,7 @@ get_interface_metric(const NET_IFINDEX index, const ADDRESS_FAMILY family) } return ipiface.Metric; } - return -err; + return -(int)err; } /* diff --git a/src/openvpnserv/automatic.c b/src/openvpnserv/automatic.c index 4123d0f..6c39aaa 100644 --- a/src/openvpnserv/automatic.c +++ b/src/openvpnserv/automatic.c @@ -155,7 +155,7 @@ match(const WIN32_FIND_DATA *find, LPCTSTR ext) * Modify the extension on a filename. */ static bool -modext(LPTSTR dest, int size, LPCTSTR src, LPCTSTR newext) +modext(LPTSTR dest, size_t size, LPCTSTR src, LPCTSTR newext) { int i; diff --git a/src/openvpnserv/common.c b/src/openvpnserv/common.c index b8b817b..7901fd6 100644 --- a/src/openvpnserv/common.c +++ b/src/openvpnserv/common.c @@ -36,7 +36,7 @@ openvpn_vsntprintf(LPTSTR str, size_t size, LPCTSTR format, va_list arglist) len = _vsntprintf(str, size, format, arglist); str[size - 1] = 0; } - return (len >= 0 && len < size); + return (len >= 0 && (size_t)len < size); } int openvpn_sntprintf(LPTSTR str, size_t size, LPCTSTR format, ...) diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 8d94197..96e0de0 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -188,7 +188,7 @@ typedef enum { static DWORD AsyncPipeOp(async_op_t op, HANDLE pipe, LPVOID buffer, DWORD size, DWORD count, LPHANDLE events) { - int i; + DWORD i; BOOL success; HANDLE io_event; DWORD res, bytes = 0; @@ -1061,7 +1061,7 @@ RegisterDNS(LPVOID unused) { ipcfg, L"ipconfig /flushdns", timeout }, { ipcfg, L"ipconfig /registerdns", timeout }, }; - int ncmds = sizeof(cmds) / sizeof(cmds[0]); + DWORD ncmds = sizeof(cmds) / sizeof(cmds[0]); HANDLE wait_handles[2] = {rdns_semaphore, exit_event}; diff --git a/src/openvpnserv/validate.c b/src/openvpnserv/validate.c index 7a2d0e3..5422d33 100644 --- a/src/openvpnserv/validate.c +++ b/src/openvpnserv/validate.c @@ -298,7 +298,7 @@ IsUserInGroup(PSID sid, const PTOKEN_GROUPS token_groups, const WCHAR *group_nam break; } /* If a match is already found, ret == TRUE and the loop is skipped */ - for (int i = 0; i < nread && !ret; ++i) + for (DWORD i = 0; i < nread && !ret; ++i) { ret = EqualSid(members[i].lgrmi0_sid, sid); }