mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-30 05:48:18 +00:00
Code Issues Releases Wiki Activity

testsudoers: make lbuf private to dump_sudoers()

Browse Source 
It is no longer used directly in main.
This commit is contained in:
Todd C. Miller 2023-06-29 20:17:22 -06:00
parent 260c2fb835
commit 689efe3cdd
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/sudoers/testsudoers.c
View File

@ -60,7 +60,7 @@ enum sudoers_formats {
/* /*
* Function Prototypes * Function Prototypes
*/ */
static void dump_sudoers(struct sudo_lbuf *lbuf); static void dump_sudoers(void);
static void set_runaspw(const char *); static void set_runaspw(const char *);
static void set_runasgr(const char *); static void set_runasgr(const char *);
static bool cb_runas_default(const char *file, int line, int column, const union sudo_defs_val *, int); static bool cb_runas_default(const char *file, int line, int column, const union sudo_defs_val *, int);
@ -112,7 +112,6 @@ main(int argc, char *argv[])
const char *errstr; const char *errstr;
int ch, dflag, exitcode = EXIT_FAILURE; int ch, dflag, exitcode = EXIT_FAILURE;
int validated, status = FOUND; int validated, status = FOUND;
struct sudo_lbuf lbuf;
time_t now; time_t now;
id_t id; id_t id;
debug_decl(main, SUDOERS_DEBUG_MAIN); debug_decl(main, SUDOERS_DEBUG_MAIN);
@ -133,9 +132,6 @@ main(int argc, char *argv[])
textdomain("sudoers"); textdomain("sudoers");
time(&now); time(&now);
/* No word wrap on output. */
sudo_lbuf_init(&lbuf, testsudoers_output, 0, NULL, 0);
/* Initialize the debug subsystem. */ /* Initialize the debug subsystem. */
if (sudo_conf_read(NULL, SUDO_CONF_DEBUG) == -1) if (sudo_conf_read(NULL, SUDO_CONF_DEBUG) == -1)
goto done; goto done;
@ -330,7 +326,7 @@ main(int argc, char *argv[])
if (dflag) { if (dflag) {
(void) putchar('\n'); (void) putchar('\n');
dump_sudoers(&lbuf); dump_sudoers();
if (argc < 2) { if (argc < 2) {
exitcode = parse_error ? 1 : 0; exitcode = parse_error ? 1 : 0;
goto done; goto done;
@ -368,7 +364,6 @@ main(int argc, char *argv[])
} }
done: done:
sudo_lbuf_destroy(&lbuf);
sudo_freepwcache(); sudo_freepwcache();
sudo_freegrcache(); sudo_freegrcache();
sudo_debug_exit_int(__func__, __FILE__, __LINE__, sudo_debug_subsys, exitcode); sudo_debug_exit_int(__func__, __FILE__, __LINE__, sudo_debug_subsys, exitcode);
@ -574,6 +569,7 @@ cb_privilege(struct privilege *priv, int host_match)
{ {
struct sudo_lbuf lbuf; struct sudo_lbuf lbuf;
/* No word wrap on output. */
sudo_lbuf_init(&lbuf, testsudoers_output, 0, NULL, 0); sudo_lbuf_init(&lbuf, testsudoers_output, 0, NULL, 0);
sudo_lbuf_append(&lbuf, "\n"); sudo_lbuf_append(&lbuf, "\n");
sudoers_format_privilege(&lbuf, &parsed_policy, priv, false); sudoers_format_privilege(&lbuf, &parsed_policy, priv, false);
@ -648,38 +644,43 @@ print_aliases(struct sudo_lbuf *lbuf)
} }
static void static void
dump_sudoers(struct sudo_lbuf *lbuf) dump_sudoers(void)
{ {
struct sudo_lbuf lbuf;
debug_decl(dump_sudoers, SUDOERS_DEBUG_UTIL); debug_decl(dump_sudoers, SUDOERS_DEBUG_UTIL);
/* No word wrap on output. */
sudo_lbuf_init(&lbuf, testsudoers_output, 0, NULL, 0);
/* Print Defaults */ /* Print Defaults */
if (!print_defaults(lbuf)) if (!print_defaults(&lbuf))
goto done; goto done;
if (lbuf->len > 0) { if (lbuf.len > 0) {
sudo_lbuf_print(lbuf); sudo_lbuf_print(&lbuf);
sudo_lbuf_append(lbuf, "\n"); sudo_lbuf_append(&lbuf, "\n");
} }
/* Print Aliases */ /* Print Aliases */
if (!print_aliases(lbuf)) if (!print_aliases(&lbuf))
goto done; goto done;
if (lbuf->len > 1) { if (lbuf.len > 1) {
sudo_lbuf_print(lbuf); sudo_lbuf_print(&lbuf);
sudo_lbuf_append(lbuf, "\n"); sudo_lbuf_append(&lbuf, "\n");
} }
/* Print User_Specs */ /* Print User_Specs */
if (!sudoers_format_userspecs(lbuf, &parsed_policy, NULL, false, true)) if (!sudoers_format_userspecs(&lbuf, &parsed_policy, NULL, false, true))
goto done; goto done;
if (lbuf->len > 1) { if (lbuf.len > 1) {
sudo_lbuf_print(lbuf); sudo_lbuf_print(&lbuf);
} }
done: done:
if (sudo_lbuf_error(lbuf)) { if (sudo_lbuf_error(&lbuf)) {
if (errno == ENOMEM) if (errno == ENOMEM)
sudo_fatalx(U_("%s: %s"), __func__, U_("unable to allocate memory")); sudo_fatalx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
} }
sudo_lbuf_destroy(&lbuf);
debug_return; debug_return;
} }