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

When listing, use separate lbufs for the defaults and the privileges and

Browse Source 
only print something if the number of privileges is non-zero.  Fixes
extraneous Defaults output for "sudo -U unauthorized_user -l".
This commit is contained in:
Todd C. Miller
2011-01-20 16:19:42 -05:00
parent 215500bb55
commit 96767abfe4
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/sudoers/sudo_nss.c
View File

@@ -253,52 +253,51 @@ void
display_privs(struct sudo_nss_list *snl, struct passwd *pw)
{
struct sudo_nss *nss;
struct lbuf lbuf;
struct lbuf defs, privs;
int count;
/* Reset group vector so group matching works correctly. */
reset_groups(pw);
lbuf_init(&lbuf, output, 4, NULL, sudo_user.cols);
lbuf_init(&defs, output, 4, NULL, sudo_user.cols);
lbuf_init(&privs, output, 4, NULL, sudo_user.cols);
/* Display defaults from all sources. */
lbuf_append(&lbuf, "Matching Defaults entries for ", pw->pw_name,
lbuf_append(&defs, "Matching Defaults entries for ", pw->pw_name,
" on this host:\n", NULL);
count = 0;
tq_foreach_fwd(snl, nss) {
count += nss->display_defaults(nss, pw, &lbuf);
}
if (count) {
lbuf_append(&lbuf, "\n\n", NULL);
lbuf_print(&lbuf);
count += nss->display_defaults(nss, pw, &defs);
}
if (count)
lbuf_append(&defs, "\n\n", NULL);
else
defs.len = 0;
/* Display Runas and Cmnd-specific defaults from all sources. */
lbuf.len = 0;
lbuf_append(&lbuf, "Runas and Command-specific defaults for ", pw->pw_name,
lbuf_append(&defs, "Runas and Command-specific defaults for ", pw->pw_name,
":\n", NULL);
count = 0;
tq_foreach_fwd(snl, nss) {
count += nss->display_bound_defaults(nss, pw, &lbuf);
}
if (count) {
lbuf_append(&lbuf, "\n\n", NULL);
lbuf_print(&lbuf);
count += nss->display_bound_defaults(nss, pw, &defs);
}
if (count)
lbuf_append(&defs, "\n\n", NULL);
/* Display privileges from all sources. */
lbuf.len = 0;
lbuf_append(&lbuf, "User ", pw->pw_name,
lbuf_append(&privs, "User ", pw->pw_name,
" may run the following commands on this host:\n", NULL);
count = 0;
tq_foreach_fwd(snl, nss) {
count += nss->display_privs(nss, pw, &lbuf);
count += nss->display_privs(nss, pw, &privs);
}
if (count) {
lbuf_print(&lbuf);
lbuf_print(&defs);
lbuf_print(&privs);
}
lbuf_destroy(&lbuf);
lbuf_destroy(&defs);
lbuf_destroy(&privs);
}
/*