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

Refactor group vector resetting into a function and also call it

Browse Source 
from display_cmnd.
Stop after the first sucessful match in display_cmnd.
Print a newline between each display_privs method.
This commit is contained in:
Todd C. Miller
2007-12-31 21:36:53 +00:00
parent 36b221af26
commit 4d8f37f4bd
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
parse.c
View File

@@ -298,20 +298,12 @@ sudo_file_lookup(nss, pwflag)
#define TAG_CHANGED(t) \ #define TAG_CHANGED(t) \
(cs->tags.t != UNSPEC && cs->tags.t != IMPLIED && cs->tags.t != tags.t) (cs->tags.t != UNSPEC && cs->tags.t != IMPLIED && cs->tags.t != tags.t)
/* /* Reset user_groups based on passwd entry. */
* Print out privileges for the specified user. static void
* XXX - move out of parse.c reset_groups(pw)
*/
void
display_privs(snl, pw)
struct sudo_nss_list *snl;
struct passwd *pw; struct passwd *pw;
{ {
struct sudo_nss *nss;
#if defined(HAVE_INITGROUPS) && defined(HAVE_GETGROUPS) #if defined(HAVE_INITGROUPS) && defined(HAVE_GETGROUPS)
/* XXX - refactor and call for display_cmnd too */
/* Reset group vector so group matching works correctly. */
if (pw != sudo_user.pw) { if (pw != sudo_user.pw) {
(void) initgroups(pw->pw_name, pw->pw_gid); (void) initgroups(pw->pw_name, pw->pw_gid);
if ((user_ngroups = getgroups(0, NULL)) > 0) { if ((user_ngroups = getgroups(0, NULL)) > 0) {
@@ -325,10 +317,29 @@ display_privs(snl, pw)
} }
} }
#endif #endif
}
tq_foreach_fwd(snl, nss) /*
* Print out privileges for the specified user.
* XXX - move out of parse.c
*/
void
display_privs(snl, pw)
struct sudo_nss_list *snl;
struct passwd *pw;
{
struct sudo_nss *nss;
/* Reset group vector so group matching works correctly. */
reset_groups(pw);
/* Display privileges from all sources. */
tq_foreach_fwd(snl, nss) {
if (nss != tq_first(snl))
putchar('\n');
nss->display_privs(nss, pw); nss->display_privs(nss, pw);
} }
}
void void
sudo_file_display_privs(nss, pw) sudo_file_display_privs(nss, pw)
@@ -546,15 +557,15 @@ display_cmnd(snl, pw)
struct passwd *pw; struct passwd *pw;
{ {
struct sudo_nss *nss; struct sudo_nss *nss;
int rval = 1;
/* XXX - reset group vector? */ /* Reset group vector so group matching works correctly. */
reset_groups(pw);
tq_foreach_fwd(snl, nss) { tq_foreach_fwd(snl, nss) {
if (nss->display_cmnd(nss, pw) == 0) if (nss->display_cmnd(nss, pw) == 0)
rval = 0; return(0);
} }
return(rval); return(1);
} }
int int