From patchwork Tue Oct 10 12:11:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 18 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director2.mail.ord1d.rsapps.net ([172.30.157.8]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id scx/OtZT3Vn8EAAAgoeIoA for ; Tue, 10 Oct 2017 19:12:22 -0400 Received: from proxy7.mail.ord1d.rsapps.net ([172.30.157.46]) by director2.mail.ord1d.rsapps.net (Dovecot) with LMTP id K3ndFdZT3VmQIwAAgYhSiA ; Tue, 10 Oct 2017 19:12:22 -0400 Received: from smtp32.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.ord1d.rsapps.net (Dovecot) with LMTP id Tx6rObdT3VlhUAAAMe1Fpw ; Tue, 10 Oct 2017 19:12:22 -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-1199-w 0-298-1001-1563-w 0-298-0-9751-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=BJvxlxYG 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=6gE8B_6XuioXVbMB5fAA: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: smtp32.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: 779212fa-ae10-11e7-ab09-842b2b572c6a-1-1 Received: from [216.34.181.88] ([216.34.181.88:7763] helo=lists.sourceforge.net) by smtp32.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 C1/2D-08254-4D35DD95; Tue, 10 Oct 2017 19:12:20 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gh-0003XL-KR; Tue, 10 Oct 2017 23:11:47 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23ge-0003X9-BC for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:44 +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; bh=aJvTRH7Psk8dPL1kh9gHqBG3ItlvGg/1+tiE5oM+jI4=; b=ejxDiiO4HwmoOzZda/jWO2H+FK5s+kOOzlCq0KNDIBZhSEL888X6IMPWd27K/M4L9nvWXBbjDmHlWKCmd0NNxva73QnBxPi4TccGRqAmRL83g9vGw4e+23gYG+DLwVBx/+90leLO671sK30b33rs6zb7JdwNnAVPBjdmHBf/wOI=; 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; bh=aJvTRH7Psk8dPL1kh9gHqBG3ItlvGg/1+tiE5oM+jI4=; b=jR1gdciNaATh+mzPBgVMMQgfX+Kynp95EUnhJSO5bA688Qb3X9Q8hrj1Dd18Lc6TCOhC5LY+KbwXAVfNd7JTcI9jisWWRjOsYAUleIJurHtqZly7IMMe+zo8GD8jTbicisaF0JTMdQV/gJfouivfXMyv0c9rmvLw7jb7ZrzOr30=; Received-SPF: pass (sog-mx-3.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-3.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gb-0000f4-1H for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:44 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id 1B05A405E6; Wed, 11 Oct 2017 01:11:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677092; bh=pq2kIVn7tU5RF9w019RawOtdaOlHevxxjukpcTKfO9E=; h=From:To:Cc:Subject:Date:Message-Id; b=KbO/c+zy/2DCCCQKxrW/Cf/w1jlMBswXfNliOHKDrP0Q0TkM1gCijp+EoVshbnuZd y6+bRhhE3+DMDdgIsCT/o5HmzPOjvBMK1JFA+aKiPrkvOrPbgdnAnEoeTieb2NuO1e GBLyTsOs00Zkq+C/7BFb+gievdj8Wz7Oa7vv0+Qg= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:18 +0200 Message-Id: <20171010231130.6832-1-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -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] -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: 1e23gb-0000f4-1H Subject: [Openvpn-devel] [PATCH 01/13] snwprintf() => _snwprintf() 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/openvpnserv/interactive.c | 12 ++++++------ src/openvpnserv/validate.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index fe9c7d6..9d473e4 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -402,8 +402,8 @@ ValidateOptions(HANDLE pipe, const WCHAR *workdir, const WCHAR *options) if (!CheckOption(workdir, 2, argv_tmp, &settings)) { - snwprintf(buf, _countof(buf), msg1, argv[0], workdir, - settings.ovpn_admin_group); + _snwprintf(buf, _countof(buf), msg1, argv[0], workdir, + settings.ovpn_admin_group); buf[_countof(buf) - 1] = L'\0'; ReturnError(pipe, ERROR_STARTUP_DATA, buf, 1, &exit_event); } @@ -421,15 +421,15 @@ ValidateOptions(HANDLE pipe, const WCHAR *workdir, const WCHAR *options) { if (wcscmp(L"--config", argv[i]) == 0 && argc-i > 1) { - snwprintf(buf, _countof(buf), msg1, argv[i+1], workdir, - settings.ovpn_admin_group); + _snwprintf(buf, _countof(buf), msg1, argv[i+1], workdir, + settings.ovpn_admin_group); buf[_countof(buf) - 1] = L'\0'; ReturnError(pipe, ERROR_STARTUP_DATA, buf, 1, &exit_event); } else { - snwprintf(buf, _countof(buf), msg2, argv[i], - settings.ovpn_admin_group); + _snwprintf(buf, _countof(buf), msg2, argv[i], + settings.ovpn_admin_group); buf[_countof(buf) - 1] = L'\0'; ReturnError(pipe, ERROR_STARTUP_DATA, buf, 1, &exit_event); } diff --git a/src/openvpnserv/validate.c b/src/openvpnserv/validate.c index f6a97e9..7a2d0e3 100644 --- a/src/openvpnserv/validate.c +++ b/src/openvpnserv/validate.c @@ -65,7 +65,7 @@ CheckConfigPath(const WCHAR *workdir, const WCHAR *fname, const settings_t *s) /* convert fname to full path */ if (PathIsRelativeW(fname) ) { - snwprintf(tmp, _countof(tmp), L"%s\\%s", workdir, fname); + _snwprintf(tmp, _countof(tmp), L"%s\\%s", workdir, fname); tmp[_countof(tmp)-1] = L'\0'; config_file = tmp; }