From patchwork Fri Nov 30 02:56:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 625 X-Patchwork-Delegate: davids@openvpn.net Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id qNLMCFxFAVy0UgAAIUCqbw for ; Fri, 30 Nov 2018 09:12:44 -0500 Received: from director5.mail.ord1c.rsapps.net ([172.28.255.1]) by director8.mail.ord1d.rsapps.net with LMTP id OCp8CFxFAVxvUgAAfY0hYg ; Fri, 30 Nov 2018 09:12:44 -0500 Received: from smtp1.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director5.mail.ord1c.rsapps.net with LMTP id EJJQCFxFAVzOWgAAH8LYwg ; Fri, 30 Nov 2018 09:12:44 -0500 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: smtp1.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=greenie.muc.de X-Suspicious-Flag: YES X-Classification-ID: 0056f8f4-f4aa-11e8-b55d-842b2b47c027-1-1 Received: from [216.105.38.7] ([216.105.38.7:43653] helo=lists.sourceforge.net) by smtp1.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 43/F6-24006-A55410C5; Fri, 30 Nov 2018 09:12:42 -0500 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 1gSjW6-0006ct-4M; Fri, 30 Nov 2018 14:11:38 +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 1gSjW4-0006cg-5X for openvpn-devel@lists.sourceforge.net; Fri, 30 Nov 2018 14:11:36 +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:References: In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/MwRiD2wWyIBPqWtpa1CiVCQHLi9oOdQJ7Qbcu8/zVc=; b=irf3LvxPC3hhoVVQJdULEhsNYa PIc2Mm36xTLxBt2sz64L3QafWfDK/RvBFAgMkKeHwCqt8GDJOaFdCQgATZTH0CS0xhXyqB+d2sOmM 1abY9jJZ2mzbxKxXr9CNtLySLeWCiE5TS6CMcblblL9dRuDz6OLsF5rPIuMWGJuA9mZQ=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=/MwRiD2wWyIBPqWtpa1CiVCQHLi9oOdQJ7Qbcu8/zVc=; b=C2w6CcE1FMyWx1gjHD+o4K/FF2 L3nZQ0z7V2sUr9fDpkNAPhzOdY7pOquZ87kiaADdnaFVtXNn0Me8EhZDKDEyEwN1IuLiEPdqi38bt lSCTtDHcho1pbLGBdiKT4iR3f8A/8iKPvPDcm+5RAoOqvSf7PHWMqSTqqRmvekQ69BnU=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1gSjVm-00Bltc-AO for openvpn-devel@lists.sourceforge.net; Fri, 30 Nov 2018 14:11:36 +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 wAUDulYN011588 for ; Fri, 30 Nov 2018 14:56:47 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.14.9/8.14.9/Submit) id wAUDulMU011587 for openvpn-devel@lists.sourceforge.net; Fri, 30 Nov 2018 14:56:47 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Fri, 30 Nov 2018 14:56:40 +0100 Message-Id: <20181130135641.11533-2-gert@greenie.muc.de> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181130135641.11533-1-gert@greenie.muc.de> References: <20181130135641.11533-1-gert@greenie.muc.de> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 TIME_LIMIT_EXCEEDED Exceeded time limit / deadline X-Headers-End: 1gSjVm-00Bltc-AO Subject: [Openvpn-devel] [PATCH 2/3] uncrustify openvpnserv/ sources 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 this is really just whitespace changes, but will make running uncrustify as pre-commit-check easier if the "base sources" won't see changes Signed-off-by: Gert Doering --- src/openvpnserv/interactive.c | 4 ++-- src/openvpnserv/service.c | 4 ++-- src/openvpnserv/service.h | 2 ++ src/openvpnserv/validate.c | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 2dc152c2..623c3ff7 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -514,7 +514,7 @@ GetStartupData(HANDLE pipe, STARTUP_DATA *sud) return TRUE; err: - sud->directory = NULL; /* caller must not free() */ + sud->directory = NULL; /* caller must not free() */ free(data); return FALSE; } @@ -1318,7 +1318,7 @@ Undo(undo_lists_t *lists) break; case block_dns: - interface_data = (block_dns_data_t*)(item->data); + interface_data = (block_dns_data_t *)(item->data); delete_block_dns_filters(interface_data->engine); if (interface_data->metric_v4 >= 0) { diff --git a/src/openvpnserv/service.c b/src/openvpnserv/service.c index 7157bea2..8efe25f9 100644 --- a/src/openvpnserv/service.c +++ b/src/openvpnserv/service.c @@ -270,8 +270,8 @@ _tmain(int argc, TCHAR *argv[]) else if (argc > i + 2 && _tcsicmp(TEXT("instance"), argv[i] + 1) == 0) { dispatchTable = _tcsicmp(TEXT("interactive"), argv[i + 1]) != 0 ? - dispatchTable_automatic : - dispatchTable_interactive; + dispatchTable_automatic : + dispatchTable_interactive; service_instance = argv[i + 2]; i += 2; diff --git a/src/openvpnserv/service.h b/src/openvpnserv/service.h index cb7020fc..f5afe2f0 100644 --- a/src/openvpnserv/service.h +++ b/src/openvpnserv/service.h @@ -77,9 +77,11 @@ extern openvpn_service_t interactive_service; extern LPCTSTR service_instance; VOID WINAPI ServiceStartAutomaticOwn(DWORD argc, LPTSTR *argv); + VOID WINAPI ServiceStartAutomatic(DWORD argc, LPTSTR *argv); VOID WINAPI ServiceStartInteractiveOwn(DWORD argc, LPTSTR *argv); + VOID WINAPI ServiceStartInteractive(DWORD argc, LPTSTR *argv); BOOL openvpn_vsntprintf(LPTSTR str, size_t size, LPCTSTR format, va_list arglist); diff --git a/src/openvpnserv/validate.c b/src/openvpnserv/validate.c index 5506e902..9e1d7d2d 100644 --- a/src/openvpnserv/validate.c +++ b/src/openvpnserv/validate.c @@ -49,6 +49,7 @@ static const WCHAR *white_list[] = }; static BOOL IsUserInGroup(PSID sid, const PTOKEN_GROUPS groups, const WCHAR *group_name); + static PTOKEN_GROUPS GetTokenGroups(const HANDLE token); /* @@ -305,7 +306,7 @@ IsUserInGroup(PSID sid, const PTOKEN_GROUPS token_groups, const WCHAR *group_nam ret = EqualSid(members[i].lgrmi0_sid, sid); } NetApiBufferFree(members); - /* MSDN says the lookup should always iterate until err != ERROR_MORE_DATA */ + /* MSDN says the lookup should always iterate until err != ERROR_MORE_DATA */ } while (err == ERROR_MORE_DATA && nloop++ < 100); if (err != NERR_Success && err != NERR_GroupNotFound)