diff options
| author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2019-11-06 15:08:43 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2019-11-06 17:06:05 +0300 |
| commit | e5db0d2fe06d66607f7d3423f75451fab2bda6ee (patch) | |
| tree | 727b39729ecd38ebc2bead9335aa9c82bfa4af80 | |
| parent | 44432b93add22888a849110f12e2c146291d2176 (diff) | |
Cygwin: pty: Change how to determine if running as service or not.
| -rw-r--r-- | winsup/cygwin/fhandler_tty.cc | 17 |
1 files 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; i<pGroupInfo->GroupCount; i++) - if (RtlEqualSid (well_known_service_sid, pGroupInfo->Groups[i].Sid)) - return true; - for (DWORD i=0; i<pGroupInfo->GroupCount; 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 |