mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 14:25:15 +00:00
Code Issues Releases Wiki Activity

Use _getgroupsbymember() on Solaris to get the groups list. Fixes

Browse Source 
performance problems with the getgroupslist() compat on Solaris
systems with network-based group databases.
This commit is contained in:
Todd C. Miller
2013-01-18 14:58:12 -05:00
parent 872e168836
commit a06a14838f
4 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
compat/getgrouplist.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010 Todd C. Miller <Todd.Miller@courtesan.com>
* Copyright (c) 2010, 2011, 2013 Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -36,7 +36,7 @@
#include "missing.h"
#ifdef HAVE_GETGRSET
#if defined(HAVE_GETGRSET)
/*
* BSD-compatible getgrouplist(3) using getgrset(3)
*/
@@ -79,7 +79,32 @@ done:
return rval;
}
#else /* HAVE_GETGRSET */
#elif defined(HAVE__GETGROUPSBYMEMBER)
/*
* BSD-compatible getgrouplist(3) using _getgroupsbymember(3)
*/
int
getgrouplist(const char *name, gid_t basegid, gid_t *groups, int *ngroupsp)
{
int ngroups, grpsize = *ngroupsp;
int rval = -1;
if (grpsize > 0) {
/* We support BSD semantics where the first element is the base gid */
groups[0] = basegid;
/* The last arg is 1 because we already filled in the base gid. */
ngroups = _getgroupsbymember(name, groups, grpsize, 1);
if (ngroups != -1) {
rval = 0;
*ngroupsp = ngroups;
}
}
return rval;
}
#else /* !HAVE_GETGRSET && !HAVE__GETGROUPSBYMEMBER */
/*
* BSD-compatible getgrouplist(3) using getgrent(3)
@@ -128,4 +153,4 @@ done:
return rval;
}
#endif /* HAVE_GETGRSET */
#endif /* !HAVE_GETGRSET && !HAVE__GETGROUPSBYMEMBER */

3
config.h.in
View File

@@ -697,6 +697,9 @@
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
/* Define to 1 if you have the `_getgroupsbymember' function. */
#undef HAVE__GETGROUPSBYMEMBER
/* Define to 1 if you have the `_getpty' function. */
#undef HAVE__GETPTY

13
configure vendored
View File

@@ -13927,6 +13927,19 @@ case "$host" in
OS_INIT=os_init_solaris
SUDO_OBJS="${SUDO_OBJS} solaris.o"
# For implementing getgrouplist()
for ac_func in _getgroupsbymember
do :
ac_fn_c_check_func "$LINENO" "_getgroupsbymember" "ac_cv_func__getgroupsbymember"
if test "x$ac_cv_func__getgroupsbymember" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE__GETGROUPSBYMEMBER 1
_ACEOF
fi
done
# To get the crypt(3) prototype (so we pass -Wall)
OSDEFS="${OSDEFS} -D__EXTENSIONS__"
# AFS support needs -lucb

3
configure.in
View File

@@ -1573,6 +1573,9 @@ case "$host" in
OS_INIT=os_init_solaris
SUDO_OBJS="${SUDO_OBJS} solaris.o"
# For implementing getgrouplist()
AC_CHECK_FUNCS(_getgroupsbymember)
# To get the crypt(3) prototype (so we pass -Wall)
OSDEFS="${OSDEFS} -D__EXTENSIONS__"
# AFS support needs -lucb