Cygwin: seteuid: disable unused funcs and lsaauth subdir

If S4U proves to be usable alone, remove this code entirely.

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

diff --git a/winsup/configure b/winsup/configure
index 23b3a7b781e91636d3b7d2b5298231aa7cbb27c8..a66c3458501418f5ff22f5307405cd4a290462e9 100755 (executable)
--- a/winsup/configure
+++ b/winsup/configure
@@ -682,7 +682,7 @@ CXXFLAGS
 CCC
 CPP'
 ac_subdirs_all='cygwin cygserver doc
-utils lsaauth'
+utils'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -3452,7 +3452,7 @@ export CXX
 subdirs="$subdirs cygwin cygserver doc"
 
 if test "x$with_cross_bootstrap" != "xyes"; then
-    subdirs="$subdirs utils lsaauth"
+    subdirs="$subdirs utils"
 
 fi
 

diff --git a/winsup/configure.ac b/winsup/configure.ac
index b975dfc1a0493562092ea49a37c6325f8e69f1e7..131dc79ee9740705305ac54d4dc1d215607ef506 100644 (file)
--- a/winsup/configure.ac
+++ b/winsup/configure.ac
@@ -36,7 +36,7 @@ AC_CYGWIN_INCLUDES
 
 AC_CONFIG_SUBDIRS(cygwin cygserver doc)
 if test "x$with_cross_bootstrap" != "xyes"; then
-    AC_CONFIG_SUBDIRS([utils lsaauth])
+    AC_CONFIG_SUBDIRS([utils])
 fi
 
 INSTALL_LICENSE="install-license"

diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc
index 21cb0727f6052cc86c5df9af7afcefbea6bb5dd4..d66a2a5d8c9fb198fe2c7702f93fc21f5ad17a3a 100644 (file)
--- a/winsup/cygwin/sec_auth.cc
+++ b/winsup/cygwin/sec_auth.cc
@@ -488,6 +488,7 @@ sid_in_token_groups (PTOKEN_GROUPS grps, cygpsid sid)
   return false;
 }
 
+#if 0 && S4U_RUNS_FINE
 static void
 get_token_group_sidlist (cygsidlist &grp_list, PTOKEN_GROUPS my_grps)
 {
@@ -523,6 +524,7 @@ get_token_group_sidlist (cygsidlist &grp_list, PTOKEN_GROUPS my_grps)
       grp_list *= well_known_users_sid;
     }
 }
+#endif
 
 bool
 get_server_groups (cygsidlist &grp_list, PSID usersid,
@@ -556,6 +558,7 @@ get_server_groups (cygsidlist &grp_list, PSID usersid,
       && sid_sub_auth (usersid, 0) == SECURITY_NT_NON_UNIQUE
       && get_logon_server (domain, server, DS_IS_FLAT_NAME))
     {
+#if 0 && S4U_RUNS_FINE
       if (check_account_disabled == CHK_DISABLED)
        {
          NET_API_STATUS napi_stat;
@@ -574,12 +577,14 @@ get_server_groups (cygsidlist &grp_list, PSID usersid,
              return false;
            }
        }
+#endif
       get_user_groups (server, grp_list, user, domain);
       get_user_local_groups (server, domain, grp_list, user);
     }
   return true;
 }
 
+#if 0 && S4U_RUNS_FINE
 static bool
 get_initgroups_sidlist (cygsidlist &grp_list, PSID usersid, PSID pgrpsid,
                        PTOKEN_GROUPS my_grps)
@@ -757,6 +762,7 @@ get_priv_list (LSA_HANDLE lsa, cygsid &usersid, cygsidlist &grp_list,
     }
   return privs;
 }
+#endif
 
 /* Accept a token if
    - the requested usersid matches the TokenUser and
@@ -900,6 +906,7 @@ account_restriction (NTSTATUS status)
   return type;
 }
 
+#if 0 && S4U_RUNS_FINE
 HANDLE
 create_token (cygsid &usersid, user_groups &new_groups)
 {
@@ -1293,6 +1300,7 @@ out:
   debug_printf ("%p = lsaauth ()", user_token);
   return user_token;
 }
+#endif
 
 #define SFU_LSA_KEY_SUFFIX     L"_microsoft_sfu_utility"