isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused system_maxgroups argument from fill_group_list().

Browse Source
This commit is contained in:
Todd C. Miller
2018-09-22 12:56:11 -06:00
parent d8870177c2
commit 9abcd61607
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/sudo.c
View File

@@ -371,7 +371,7 @@ fix_fds(void)
* Returns 0 on success and -1 on failure. * Returns 0 on success and -1 on failure.
*/ */
static int static int
fill_group_list(struct user_details *ud, int system_maxgroups) fill_group_list(struct user_details *ud)
{ {
int ret = -1; int ret = -1;
debug_decl(fill_group_list, SUDO_DEBUG_UTIL) debug_decl(fill_group_list, SUDO_DEBUG_UTIL)
@@ -412,16 +412,16 @@ get_user_groups(struct user_details *ud)
{ {
char *cp, *gid_list = NULL; char *cp, *gid_list = NULL;
size_t glsize; size_t glsize;
int i, len, maxgroups, group_source; int i, len, group_source;
debug_decl(get_user_groups, SUDO_DEBUG_UTIL) debug_decl(get_user_groups, SUDO_DEBUG_UTIL)
maxgroups = (int)sysconf(_SC_NGROUPS_MAX);
if (maxgroups < 0)
maxgroups = NGROUPS_MAX;
ud->groups = NULL; ud->groups = NULL;
group_source = sudo_conf_group_source(); group_source = sudo_conf_group_source();
if (group_source != GROUP_SOURCE_DYNAMIC) { if (group_source != GROUP_SOURCE_DYNAMIC) {
int maxgroups = (int)sysconf(_SC_NGROUPS_MAX);
if (maxgroups < 0)
maxgroups = NGROUPS_MAX;
if ((ud->ngroups = getgroups(0, NULL)) > 0) { if ((ud->ngroups = getgroups(0, NULL)) > 0) {
/* Use groups from kernel if not too many or source is static. */ /* Use groups from kernel if not too many or source is static. */
if (ud->ngroups < maxgroups || group_source == GROUP_SOURCE_STATIC) { if (ud->ngroups < maxgroups || group_source == GROUP_SOURCE_STATIC) {
@@ -447,7 +447,7 @@ get_user_groups(struct user_details *ud)
* Query group database if kernel list is too small or disabled. * Query group database if kernel list is too small or disabled.
* Typically, this is because NFS can only support up to 16 groups. * Typically, this is because NFS can only support up to 16 groups.
*/ */
if (fill_group_list(ud, maxgroups) == -1) if (fill_group_list(ud) == -1)
sudo_fatal(U_("unable to get group vector")); sudo_fatal(U_("unable to get group vector"));
} }