Skip to content

Commit

Permalink
uncrustify openvpnserv/ sources
Browse files Browse the repository at this point in the history
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 <[email protected]>
Acked-by: David Sommerseth <[email protected]>
Message-Id: <[email protected]>
URL: https://www.mail-archive.com/[email protected]/msg17971.html
Signed-off-by: David Sommerseth <[email protected]>
  • Loading branch information
cron2 authored and dsommers committed Dec 12, 2018
1 parent 8e2ec9e commit a7b5993
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/openvpnserv/interactive.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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)
{
Expand Down
4 changes: 2 additions & 2 deletions src/openvpnserv/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/openvpnserv/service.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/openvpnserv/validate.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/*
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit a7b5993

Please sign in to comment.