From 080eae709f41e9e5d194bcc59014cf1c03526ec4 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 29 Oct 2021 18:17:00 +0200 Subject: [PATCH] Cygwin: drop support for systems not supporting the CONSOLE LOGON SID i. e. Vista/2008. Signed-off-by: Corinna Vinschen --- winsup/cygwin/sec_auth.cc | 3 +-- winsup/cygwin/wincap.cc | 11 ----------- winsup/cygwin/wincap.h | 2 -- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc index 83fb39bc5..9aae7c1d5 100644 --- a/winsup/cygwin/sec_auth.cc +++ b/winsup/cygwin/sec_auth.cc @@ -528,8 +528,7 @@ get_token_group_sidlist (cygsidlist &grp_list, PTOKEN_GROUPS my_grps) if (my_grps) { grp_list += well_known_local_sid; - if (wincap.has_console_logon_sid ()) - grp_list += well_known_console_logon_sid; + grp_list += well_known_console_logon_sid; if (sid_in_token_groups (my_grps, well_known_dialup_sid)) grp_list *= well_known_dialup_sid; if (sid_in_token_groups (my_grps, well_known_network_sid)) diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc index 63b0a261d..5c923277e 100644 --- a/winsup/cygwin/wincap.cc +++ b/winsup/cygwin/wincap.cc @@ -25,7 +25,6 @@ wincaps wincap_vista __attribute__((section (".cygwin_dll_common"), shared)) = { is_server:false, needs_query_information:true, has_gaa_largeaddress_bug:true, - has_console_logon_sid:false, has_precise_system_time:false, has_microsoft_accounts:false, has_broken_prefetchvm:false, @@ -57,7 +56,6 @@ wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = { is_server:false, needs_query_information:true, has_gaa_largeaddress_bug:true, - has_console_logon_sid:true, has_precise_system_time:false, has_microsoft_accounts:false, has_broken_prefetchvm:false, @@ -89,7 +87,6 @@ wincaps wincap_8 __attribute__((section (".cygwin_dll_common"), shared)) = { is_server:false, needs_query_information:true, has_gaa_largeaddress_bug:false, - has_console_logon_sid:true, has_precise_system_time:true, has_microsoft_accounts:true, has_broken_prefetchvm:false, @@ -121,7 +118,6 @@ wincaps wincap_8_1 __attribute__((section (".cygwin_dll_common"), shared)) = { is_server:false, needs_query_information:false, has_gaa_largeaddress_bug:false, - has_console_logon_sid:true, has_precise_system_time:true, has_microsoft_accounts:true, has_broken_prefetchvm:false, @@ -153,7 +149,6 @@ wincaps wincap_10_1507 __attribute__((section (".cygwin_dll_common"), shared)) is_server:false, needs_query_information:false, has_gaa_largeaddress_bug:false, - has_console_logon_sid:true, has_precise_system_time:true, has_microsoft_accounts:true, has_broken_prefetchvm:true, @@ -185,7 +180,6 @@ wincaps wincap_10_1607 __attribute__((section (".cygwin_dll_common"), shared)) is_server:false, needs_query_information:false, has_gaa_largeaddress_bug:false, - has_console_logon_sid:true, has_precise_system_time:true, has_microsoft_accounts:true, has_broken_prefetchvm:true, @@ -217,7 +211,6 @@ wincaps wincap_10_1703 __attribute__((section (".cygwin_dll_common"), shared)) = is_server:false, needs_query_information:false, has_gaa_largeaddress_bug:false, - has_console_logon_sid:true, has_precise_system_time:true, has_microsoft_accounts:true, has_broken_prefetchvm:false, @@ -249,7 +242,6 @@ wincaps wincap_10_1709 __attribute__((section (".cygwin_dll_common"), shared)) = is_server:false, needs_query_information:false, has_gaa_largeaddress_bug:false, - has_console_logon_sid:true, has_precise_system_time:true, has_microsoft_accounts:true, has_broken_prefetchvm:false, @@ -281,7 +273,6 @@ wincaps wincap_10_1803 __attribute__((section (".cygwin_dll_common"), shared)) = is_server:false, needs_query_information:false, has_gaa_largeaddress_bug:false, - has_console_logon_sid:true, has_precise_system_time:true, has_microsoft_accounts:true, has_broken_prefetchvm:false, @@ -313,7 +304,6 @@ wincaps wincap_10_1809 __attribute__((section (".cygwin_dll_common"), shared)) = is_server:false, needs_query_information:false, has_gaa_largeaddress_bug:false, - has_console_logon_sid:true, has_precise_system_time:true, has_microsoft_accounts:true, has_broken_prefetchvm:false, @@ -345,7 +335,6 @@ wincaps wincap_10_1903 __attribute__((section (".cygwin_dll_common"), shared)) = is_server:false, needs_query_information:false, has_gaa_largeaddress_bug:false, - has_console_logon_sid:true, has_precise_system_time:true, has_microsoft_accounts:true, has_broken_prefetchvm:false, diff --git a/winsup/cygwin/wincap.h b/winsup/cygwin/wincap.h index 0d86a80e4..ba9a3b59d 100644 --- a/winsup/cygwin/wincap.h +++ b/winsup/cygwin/wincap.h @@ -19,7 +19,6 @@ struct wincaps unsigned is_server : 1; unsigned needs_query_information : 1; unsigned has_gaa_largeaddress_bug : 1; - unsigned has_console_logon_sid : 1; unsigned has_precise_system_time : 1; unsigned has_microsoft_accounts : 1; unsigned has_broken_prefetchvm : 1; @@ -83,7 +82,6 @@ public: bool IMPLEMENT (is_server) bool IMPLEMENT (needs_query_information) bool IMPLEMENT (has_gaa_largeaddress_bug) - bool IMPLEMENT (has_console_logon_sid) bool IMPLEMENT (has_precise_system_time) bool IMPLEMENT (has_microsoft_accounts) bool IMPLEMENT (has_broken_prefetchvm)