From 32db005b18697944f12e8d58ed9e30785311a2d6 Mon Sep 17 00:00:00 2001 From: Takashi Yano Date: Wed, 6 Nov 2019 21:08:43 +0900 Subject: [PATCH] Cygwin: pty: Change how to determine if running as service or not. --- winsup/cygwin/fhandler_tty.cc | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index da6119dfb..0109d452b 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -3094,22 +3094,11 @@ pty_master_fwd_thread (VOID *arg) the helper process is running as privileged user while slave process is not. This function is used to determine if the process is running as a srvice or not. */ -static bool +inline static bool is_running_as_service (void) { - DWORD dwSize = 0; - PTOKEN_GROUPS pGroupInfo; - tmp_pathbuf tp; - pGroupInfo = (PTOKEN_GROUPS) tp.w_get (); - NtQueryInformationToken (hProcToken, TokenGroups, pGroupInfo, - 2 * NT_MAX_PATH, &dwSize); - for (DWORD i=0; iGroupCount; i++) - if (RtlEqualSid (well_known_service_sid, pGroupInfo->Groups[i].Sid)) - return true; - for (DWORD i=0; iGroupCount; i++) - if (RtlEqualSid (well_known_interactive_sid, pGroupInfo->Groups[i].Sid)) - return false; - return true; + return check_token_membership (well_known_service_sid) + || cygheap->user.saved_sid () == well_known_system_sid; } bool