Cygwin: drop wincap::has_microsoft_accounts

Only required for Windows 7.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

3 files changed, 1 insertions, 15 deletions

diff --git a/winsup/cygwin/local_includes/wincap.h b/winsup/cygwin/local_includes/wincap.h
index 0a2ad7b59..a99d02c4c 100644
--- a/winsup/cygwin/local_includes/wincap.h
+++ b/winsup/cygwin/local_includes/wincap.h
@@ -17,7 +17,6 @@ struct wincaps
      ops generated by gcc are off by 4 bytes. */
   struct  __attribute__ ((aligned (8))) {
     unsigned is_server						: 1;
-    unsigned has_microsoft_accounts				: 1;
     unsigned has_new_pebteb_region				: 1;
     unsigned has_broken_whoami					: 1;
     unsigned has_unprivileged_createsymlink			: 1;
@@ -74,7 +73,6 @@ public:
   }
   intptr_t IMPLEMENT (mmap_storage_high)
   bool  IMPLEMENT (is_server)
-  bool	IMPLEMENT (has_microsoft_accounts)
   bool	IMPLEMENT (has_new_pebteb_region)
   bool	IMPLEMENT (has_broken_whoami)
   bool	IMPLEMENT (has_unprivileged_createsymlink)
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index ce997c0f8..35d9c12cd 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -2235,7 +2235,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
 	      bool its_ok = false;
 	      if (sid_id_auth (sid) == 12)
 		its_ok = true;
-	      else if (wincap.has_microsoft_accounts ())
+	      else /* Microsoft Account */
 		{
 		  USER_INFO_24 *ui24;
 		  if (NetUserGetInfo (NULL, name, 24, (PBYTE *) &ui24)
diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc
index 7ee8f4b06..ce64289f8 100644
--- a/winsup/cygwin/wincap.cc
+++ b/winsup/cygwin/wincap.cc
@@ -24,7 +24,6 @@ wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = {
   mmap_storage_high:__MMAP_STORAGE_HIGH_LEGACY,
   {
     is_server:false,
-    has_microsoft_accounts:false,
     has_new_pebteb_region:false,
     has_broken_whoami:true,
     has_unprivileged_createsymlink:false,
@@ -53,7 +52,6 @@ wincaps wincap_8 __attribute__((section (".cygwin_dll_common"), shared)) = {
   mmap_storage_high:__MMAP_STORAGE_HIGH_LEGACY,
   {
     is_server:false,
-    has_microsoft_accounts:true,
     has_new_pebteb_region:false,
     has_broken_whoami:false,
     has_unprivileged_createsymlink:false,
@@ -82,7 +80,6 @@ wincaps wincap_8_1 __attribute__((section (".cygwin_dll_common"), shared)) = {
   mmap_storage_high:__MMAP_STORAGE_HIGH,
   {
     is_server:false,
-    has_microsoft_accounts:true,
     has_new_pebteb_region:false,
     has_broken_whoami:false,
     has_unprivileged_createsymlink:false,
@@ -111,7 +108,6 @@ wincaps  wincap_10_1507 __attribute__((section (".cygwin_dll_common"), shared))
   mmap_storage_high:__MMAP_STORAGE_HIGH,
   {
     is_server:false,
-    has_microsoft_accounts:true,
     has_new_pebteb_region:false,
     has_broken_whoami:false,
     has_unprivileged_createsymlink:false,
@@ -140,7 +136,6 @@ wincaps  wincap_10_1607 __attribute__((section (".cygwin_dll_common"), shared))
   mmap_storage_high:__MMAP_STORAGE_HIGH,
   {
     is_server:false,
-    has_microsoft_accounts:true,
     has_new_pebteb_region:false,
     has_broken_whoami:false,
     has_unprivileged_createsymlink:false,
@@ -169,7 +164,6 @@ wincaps wincap_10_1703 __attribute__((section (".cygwin_dll_common"), shared)) =
   mmap_storage_high:__MMAP_STORAGE_HIGH,
   {
     is_server:false,
-    has_microsoft_accounts:true,
     has_new_pebteb_region:true,
     has_broken_whoami:false,
     has_unprivileged_createsymlink:true,
@@ -198,7 +192,6 @@ wincaps wincap_10_1709 __attribute__((section (".cygwin_dll_common"), shared)) =
   mmap_storage_high:__MMAP_STORAGE_HIGH,
   {
     is_server:false,
-    has_microsoft_accounts:true,
     has_new_pebteb_region:true,
     has_broken_whoami:false,
     has_unprivileged_createsymlink:true,
@@ -227,7 +220,6 @@ wincaps wincap_10_1803 __attribute__((section (".cygwin_dll_common"), shared)) =
   mmap_storage_high:__MMAP_STORAGE_HIGH,
   {
     is_server:false,
-    has_microsoft_accounts:true,
     has_new_pebteb_region:true,
     has_broken_whoami:false,
     has_unprivileged_createsymlink:true,
@@ -256,7 +248,6 @@ wincaps wincap_10_1809 __attribute__((section (".cygwin_dll_common"), shared)) =
   mmap_storage_high:__MMAP_STORAGE_HIGH,
   {
     is_server:false,
-    has_microsoft_accounts:true,
     has_new_pebteb_region:true,
     has_broken_whoami:false,
     has_unprivileged_createsymlink:true,
@@ -285,7 +276,6 @@ wincaps wincap_10_1903 __attribute__((section (".cygwin_dll_common"), shared)) =
   mmap_storage_high:__MMAP_STORAGE_HIGH,
   {
     is_server:false,
-    has_microsoft_accounts:true,
     has_new_pebteb_region:true,
     has_broken_whoami:false,
     has_unprivileged_createsymlink:true,
@@ -314,7 +304,6 @@ wincaps wincap_10_2004 __attribute__((section (".cygwin_dll_common"), shared)) =
   mmap_storage_high:__MMAP_STORAGE_HIGH,
   {
     is_server:false,
-    has_microsoft_accounts:true,
     has_new_pebteb_region:true,
     has_broken_whoami:false,
     has_unprivileged_createsymlink:true,
@@ -343,7 +332,6 @@ wincaps wincap_11 __attribute__((section (".cygwin_dll_common"), shared)) = {
   mmap_storage_high:__MMAP_STORAGE_HIGH,
   {
     is_server:false,
-    has_microsoft_accounts:true,
     has_new_pebteb_region:true,
     has_broken_whoami:false,
     has_unprivileged_createsymlink:true,