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>
This commit is contained in:
Corinna Vinschen 2019-01-27 13:32:44 +01:00
parent 3b21333172
commit 2741dd0550
3 changed files with 11 additions and 3 deletions

4
winsup/configure vendored
View File

@ -682,7 +682,7 @@ CXXFLAGS
CCC CCC
CPP' CPP'
ac_subdirs_all='cygwin cygserver doc ac_subdirs_all='cygwin cygserver doc
utils lsaauth' utils'
# Initialize some variables set by options. # Initialize some variables set by options.
ac_init_help= ac_init_help=
@ -3452,7 +3452,7 @@ export CXX
subdirs="$subdirs cygwin cygserver doc" subdirs="$subdirs cygwin cygserver doc"
if test "x$with_cross_bootstrap" != "xyes"; then if test "x$with_cross_bootstrap" != "xyes"; then
subdirs="$subdirs utils lsaauth" subdirs="$subdirs utils"
fi fi

View File

@ -36,7 +36,7 @@ AC_CYGWIN_INCLUDES
AC_CONFIG_SUBDIRS(cygwin cygserver doc) AC_CONFIG_SUBDIRS(cygwin cygserver doc)
if test "x$with_cross_bootstrap" != "xyes"; then if test "x$with_cross_bootstrap" != "xyes"; then
AC_CONFIG_SUBDIRS([utils lsaauth]) AC_CONFIG_SUBDIRS([utils])
fi fi
INSTALL_LICENSE="install-license" INSTALL_LICENSE="install-license"

View File

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