[PATCH] Cygwin: pty: Change how to determine if running as service or not.
Corinna Vinschen
corinna-cygwin@cygwin.com
Wed Nov 6 14:06:00 GMT 2019
On Nov 6 21:08, Takashi Yano wrote:
> ---
> 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 f87ac73f2..2b4ad6e58 100644
> --- a/winsup/cygwin/fhandler_tty.cc
> +++ b/winsup/cygwin/fhandler_tty.cc
> @@ -3095,22 +3095,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
> --
> 2.21.0
Pushed.
Thanks,
Corinna
--
Corinna Vinschen
Cygwin Maintainer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://cygwin.com/pipermail/cygwin-patches/attachments/20191106/1d7e7f49/attachment.sig>
More information about the Cygwin-patches
mailing list