--- embedaddon/sudo/plugins/sudoers/visudo.c 2012/10/09 09:29:52 1.1.1.3 +++ embedaddon/sudo/plugins/sudoers/visudo.c 2014/06/15 16:12:54 1.1.1.6 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1998-2005, 2007-2012 + * Copyright (c) 1996, 1998-2005, 2007-2013 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any @@ -32,10 +32,10 @@ #include #include -#include #include #include #include +#include #ifndef __TANDEM # include #endif @@ -67,35 +67,32 @@ #include #include #include -#include -#if TIME_WITH_SYS_TIME +#ifdef TIME_WITH_SYS_TIME # include #endif -#ifdef HAVE_SETLOCALE -# include -#endif +#ifdef HAVE_GETOPT_LONG +# include +# else +# include "compat/getopt.h" +#endif /* HAVE_GETOPT_LONG */ #include "sudoers.h" -#include "interfaces.h" #include "parse.h" #include "redblack.h" -#include "gettext.h" #include "sudoers_version.h" #include "sudo_conf.h" #include struct sudoersfile { - struct sudoersfile *prev, *next; + TAILQ_ENTRY(sudoersfile) entries; char *path; char *tpath; int fd; int modified; int doedit; }; -TQ_DECLARE(sudoersfile) +TAILQ_HEAD(sudoersfile_list, sudoersfile); -sudo_conv_t sudo_conv; /* NULL in non-plugin */ - /* * Function prototypes */ @@ -109,41 +106,40 @@ static bool check_syntax(char *, bool, bool, bool); static bool edit_sudoers(struct sudoersfile *, char *, char *, int); static bool install_sudoers(struct sudoersfile *, bool); static int print_unused(void *, void *); -static void reparse_sudoers(char *, char *, bool, bool); +static bool reparse_sudoers(char *, char *, bool, bool); static int run_command(char *, char **); -static int visudo_printf(int msg_type, const char *fmt, ...); static void setup_signals(void); static void help(void) __attribute__((__noreturn__)); static void usage(int); +static void visudo_cleanup(void); -void cleanup(int); +extern bool export_sudoers(const char *, const char *, bool, bool); -extern void yyerror(const char *); -extern void yyrestart(FILE *); +extern void sudoerserror(const char *); +extern void sudoersrestart(FILE *); /* - * External globals exported by the parser - */ -extern struct rbtree *aliases; -extern FILE *yyin; -extern char *sudoers, *errorfile; -extern int errorlineno; -extern bool parse_error; -/* For getopt(3) */ -extern char *optarg; -extern int optind; - -/* * Globals */ -struct interface *interfaces; struct sudo_user sudo_user; struct passwd *list_pw; -sudo_printf_t sudo_printf = visudo_printf; -static struct sudoersfile_list sudoerslist; +static struct sudoersfile_list sudoerslist = TAILQ_HEAD_INITIALIZER(sudoerslist); static struct rbtree *alias_freelist; static bool checkonly; +static const char short_opts[] = "cf:hqsVx:"; +static struct option long_opts[] = { + { "check", no_argument, NULL, 'c' }, + { "export", required_argument, NULL, 'x' }, + { "file", required_argument, NULL, 'f' }, + { "help", no_argument, NULL, 'h' }, + { "quiet", no_argument, NULL, 'q' }, + { "strict", no_argument, NULL, 's' }, + { "version", no_argument, NULL, 'V' }, + { NULL, no_argument, NULL, '\0' }, +}; +__dso_public int main(int argc, char *argv[]); + int main(int argc, char *argv[]) { @@ -151,6 +147,7 @@ main(int argc, char *argv[]) char *args, *editor, *sudoers_path; int ch, exitcode = 0; bool quiet, strict, oldperms; + const char *export_path; debug_decl(main, SUDO_DEBUG_MAIN) #if defined(SUDO_DEVEL) && defined(__OpenBSD__) @@ -160,32 +157,33 @@ main(int argc, char *argv[]) } #endif -#if !defined(HAVE_GETPROGNAME) && !defined(HAVE___PROGNAME) - setprogname(argc > 0 ? argv[0] : "visudo"); -#endif - -#ifdef HAVE_SETLOCALE - setlocale(LC_ALL, ""); -#endif + initprogname(argc > 0 ? argv[0] : "visudo"); + sudoers_initlocale(setlocale(LC_ALL, ""), def_sudoers_locale); bindtextdomain("sudoers", LOCALEDIR); /* XXX - should have visudo domain */ textdomain("sudoers"); if (argc < 1) usage(1); + /* Register fatal/fatalx callback. */ + fatal_callback_register(visudo_cleanup); + /* Read sudo.conf. */ - sudo_conf_read(); + sudo_conf_read(NULL); /* * Arg handling. */ checkonly = oldperms = quiet = strict = false; + export_path = NULL; sudoers_path = _PATH_SUDOERS; - while ((ch = getopt(argc, argv, "Vcf:sq")) != -1) { + while ((ch = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) { switch (ch) { case 'V': - (void) printf(_("%s version %s\n"), getprogname(), PACKAGE_VERSION); - (void) printf(_("%s grammar version %d\n"), getprogname(), SUDOERS_GRAMMAR_VERSION); + (void) printf(_("%s version %s\n"), getprogname(), + PACKAGE_VERSION); + (void) printf(_("%s grammar version %d\n"), getprogname(), + SUDOERS_GRAMMAR_VERSION); goto done; case 'c': checkonly = true; /* check mode */ @@ -201,8 +199,11 @@ main(int argc, char *argv[]) strict = true; /* strict mode */ break; case 'q': - quiet = false; /* quiet mode */ + quiet = true; /* quiet mode */ break; + case 'x': + export_path = optarg; /* export mode */ + break; default: usage(1); } @@ -215,9 +216,9 @@ main(int argc, char *argv[]) sudo_setgrent(); /* Mock up a fake sudo_user struct. */ - user_cmnd = ""; + user_cmnd = user_base = ""; if ((sudo_user.pw = sudo_getpwuid(getuid())) == NULL) - errorx(1, _("you do not exist in the %s database"), "passwd"); + fatalx(U_("you do not exist in the %s database"), "passwd"); get_hostname(); /* Setup defaults data structures. */ @@ -227,16 +228,19 @@ main(int argc, char *argv[]) exitcode = check_syntax(sudoers_path, quiet, strict, oldperms) ? 0 : 1; goto done; } + if (export_path != NULL) { + exitcode = export_sudoers(sudoers_path, export_path, quiet, strict) ? 0 : 1; + goto done; + } /* - * Parse the existing sudoers file(s) in quiet mode to highlight any - * existing errors and to pull in editor and env_editor conf values. + * Parse the existing sudoers file(s) to highlight any existing + * errors and to pull in editor and env_editor conf values. */ - if ((yyin = open_sudoers(sudoers_path, true, NULL)) == NULL) { - error(1, "%s", sudoers_path); - } + if ((sudoersin = open_sudoers(sudoers_path, true, NULL)) == NULL) + exit(1); init_parser(sudoers_path, false); - yyparse(); + sudoersparse(); (void) update_defaults(SETDEF_GENERIC|SETDEF_HOST|SETDEF_USER); editor = get_editor(&args); @@ -245,10 +249,10 @@ main(int argc, char *argv[]) setup_signals(); /* Edit the sudoers file(s) */ - tq_foreach_fwd(&sudoerslist, sp) { + TAILQ_FOREACH(sp, &sudoerslist, entries) { if (!sp->doedit) continue; - if (sp != tq_first(&sudoerslist)) { + if (sp != TAILQ_FIRST(&sudoerslist)) { printf(_("press return to edit %s: "), sp->path); while ((ch = getchar()) != EOF && ch != '\n') continue; @@ -256,16 +260,18 @@ main(int argc, char *argv[]) edit_sudoers(sp, editor, args, -1); } - /* Check edited files for a parse error and re-edit any that fail. */ - reparse_sudoers(editor, args, strict, quiet); - - /* Install the sudoers temp files as needed. */ - tq_foreach_fwd(&sudoerslist, sp) { - (void) install_sudoers(sp, oldperms); + /* + * Check edited files for a parse error, re-edit any that fail + * and install the edited files as needed. + */ + if (reparse_sudoers(editor, args, strict, quiet)) { + TAILQ_FOREACH(sp, &sudoerslist, entries) { + (void) install_sudoers(sp, oldperms); + } } done: - sudo_debug_exit_int(__func__, __FILE__, __LINE__, sudo_debug_subsys, exitcode); + sudo_debug_exit_int(__func__, __FILE__, __LINE__, sudo_debug_subsys, exitcode); exit(exitcode); } @@ -316,7 +322,7 @@ edit_sudoers(struct sudoersfile *sp, char *editor, cha debug_decl(edit_sudoers, SUDO_DEBUG_UTIL) if (fstat(sp->fd, &sb) == -1) - error(1, _("unable to stat %s"), sp->path); + fatal(U_("unable to stat %s"), sp->path); orig_size = sb.st_size; mtim_get(&sb, &orig_mtim); @@ -325,20 +331,20 @@ edit_sudoers(struct sudoersfile *sp, char *editor, cha easprintf(&sp->tpath, "%s.tmp", sp->path); tfd = open(sp->tpath, O_WRONLY | O_CREAT | O_TRUNC, 0600); if (tfd < 0) - error(1, "%s", sp->tpath); + fatal("%s", sp->tpath); /* Copy sp->path -> sp->tpath and reset the mtime. */ if (orig_size != 0) { (void) lseek(sp->fd, (off_t)0, SEEK_SET); while ((nread = read(sp->fd, buf, sizeof(buf))) > 0) if (write(tfd, buf, nread) != nread) - error(1, _("write error")); + fatal(U_("write error")); /* Add missing newline at EOF if needed. */ if (nread > 0 && buf[nread - 1] != '\n') { buf[0] = '\n'; if (write(tfd, buf, 1) != 1) - error(1, _("write error")); + fatal(U_("write error")); } } (void) close(tfd); @@ -420,31 +426,30 @@ edit_sudoers(struct sudoersfile *sp, char *editor, cha * Sanity checks. */ if (stat(sp->tpath, &sb) < 0) { - warningx(_("unable to stat temporary file (%s), %s unchanged"), + warningx(U_("unable to stat temporary file (%s), %s unchanged"), sp->tpath, sp->path); goto done; } if (sb.st_size == 0 && orig_size != 0) { - warningx(_("zero length temporary file (%s), %s unchanged"), + warningx(U_("zero length temporary file (%s), %s unchanged"), sp->tpath, sp->path); sp->modified = true; goto done; } } else { - warningx(_("editor (%s) failed, %s unchanged"), editor, sp->path); + warningx(U_("editor (%s) failed, %s unchanged"), editor, sp->path); goto done; } - /* Set modified bit if use changed the file. */ + /* Set modified bit if the user changed the file. */ modified = true; mtim_get(&sb, &tv); - if (orig_size == sb.st_size && timevalcmp(&orig_mtim, &tv, ==)) { + if (orig_size == sb.st_size && sudo_timevalcmp(&orig_mtim, &tv, ==)) { /* * If mtime and size match but the user spent no measurable * time in the editor we can't tell if the file was changed. */ - timevalsub(&tv1, &tv2); - if (timevalisset(&tv2)) + if (sudo_timevalcmp(&tv1, &tv2, !=)) modified = false; } @@ -454,7 +459,7 @@ edit_sudoers(struct sudoersfile *sp, char *editor, cha if (modified) sp->modified = modified; else - warningx(_("%s unchanged"), sp->tpath); + warningx(U_("%s unchanged"), sp->tpath); rval = true; done: @@ -464,7 +469,7 @@ done: /* * Parse sudoers after editing and re-edit any ones that caused a parse error. */ -static void +static bool reparse_sudoers(char *editor, char *args, bool strict, bool quiet) { struct sudoersfile *sp, *last; @@ -472,33 +477,29 @@ reparse_sudoers(char *editor, char *args, bool strict, int ch; debug_decl(reparse_sudoers, SUDO_DEBUG_UTIL) - if (tq_empty(&sudoerslist)) - debug_return; - /* * Parse the edited sudoers files and do sanity checking */ - do { - sp = tq_first(&sudoerslist); - last = tq_last(&sudoerslist); + while ((sp = TAILQ_FIRST(&sudoerslist)) != NULL) { + last = TAILQ_LAST(&sudoerslist, sudoersfile_list); fp = fopen(sp->tpath, "r+"); if (fp == NULL) - errorx(1, _("unable to re-open temporary file (%s), %s unchanged."), + fatalx(U_("unable to re-open temporary file (%s), %s unchanged."), sp->tpath, sp->path); /* Clean slate for each parse */ init_defaults(); init_parser(sp->path, quiet); - /* Parse the sudoers temp file */ - yyrestart(fp); - if (yyparse() && !parse_error) { - warningx(_("unabled to parse temporary file (%s), unknown error"), + /* Parse the sudoers temp file(s) */ + sudoersrestart(fp); + if (sudoersparse() && !parse_error) { + warningx(U_("unabled to parse temporary file (%s), unknown error"), sp->tpath); parse_error = true; errorfile = sp->path; } - fclose(yyin); + fclose(sudoersin); if (!parse_error) { if (!check_defaults(SETDEF_ALL, quiet) || check_aliases(strict, quiet) != 0) { @@ -508,45 +509,48 @@ reparse_sudoers(char *editor, char *args, bool strict, } /* - * Got an error, prompt the user for what to do now + * Got an error, prompt the user for what to do now. */ if (parse_error) { switch (whatnow()) { - case 'Q' : parse_error = false; /* ignore parse error */ - break; - case 'x' : /* XXX - should return instead of exiting */ - cleanup(0); - sudo_debug_exit_int(__func__, __FILE__, - __LINE__, sudo_debug_subsys, 0); - exit(0); - break; - } - } - if (parse_error) { - /* Edit file with the parse error */ - tq_foreach_fwd(&sudoerslist, sp) { - if (errorfile == NULL || strcmp(sp->path, errorfile) == 0) { - edit_sudoers(sp, editor, args, errorlineno); - if (errorfile != NULL) - break; + case 'Q': + parse_error = false; /* ignore parse error */ + break; + case 'x': + visudo_cleanup(); /* discard changes */ + debug_return_bool(false); + case 'e': + default: + /* Edit file with the parse error */ + TAILQ_FOREACH(sp, &sudoerslist, entries) { + if (errorfile == NULL || strcmp(sp->path, errorfile) == 0) { + edit_sudoers(sp, editor, args, errorlineno); + if (errorfile != NULL) + break; + } } + if (errorfile != NULL && sp == NULL) { + fatalx(U_("internal error, unable to find %s in list!"), + sudoers); + } + break; } - if (errorfile != NULL && sp == NULL) { - errorx(1, _("internal error, unable to find %s in list!"), - sudoers); - } } /* If any new #include directives were added, edit them too. */ - for (sp = last->next; sp != NULL; sp = sp->next) { + for (sp = TAILQ_NEXT(last, entries); sp != NULL; sp = TAILQ_NEXT(sp, entries)) { printf(_("press return to edit %s: "), sp->path); while ((ch = getchar()) != EOF && ch != '\n') continue; edit_sudoers(sp, editor, args, errorlineno); } - } while (parse_error); - debug_return; + /* If all sudoers files parsed OK we are done. */ + if (!parse_error) + break; + } + + debug_return_bool(true); } /* @@ -582,23 +586,23 @@ install_sudoers(struct sudoersfile *sp, bool oldperms) if (oldperms) { /* Use perms of the existing file. */ if (fstat(sp->fd, &sb) == -1) - error(1, _("unable to stat %s"), sp->path); + fatal(U_("unable to stat %s"), sp->path); if (chown(sp->tpath, sb.st_uid, sb.st_gid) != 0) { - warning(_("unable to set (uid, gid) of %s to (%u, %u)"), + warning(U_("unable to set (uid, gid) of %s to (%u, %u)"), sp->tpath, (unsigned int)sb.st_uid, (unsigned int)sb.st_gid); } if (chmod(sp->tpath, sb.st_mode & 0777) != 0) { - warning(_("unable to change mode of %s to 0%o"), sp->tpath, + warning(U_("unable to change mode of %s to 0%o"), sp->tpath, (unsigned int)(sb.st_mode & 0777)); } } else { if (chown(sp->tpath, SUDOERS_UID, SUDOERS_GID) != 0) { - warning(_("unable to set (uid, gid) of %s to (%u, %u)"), + warning(U_("unable to set (uid, gid) of %s to (%u, %u)"), sp->tpath, SUDOERS_UID, SUDOERS_GID); goto done; } if (chmod(sp->tpath, SUDOERS_MODE) != 0) { - warning(_("unable to change mode of %s to 0%o"), sp->tpath, + warning(U_("unable to change mode of %s to 0%o"), sp->tpath, SUDOERS_MODE); goto done; } @@ -615,7 +619,7 @@ install_sudoers(struct sudoersfile *sp, bool oldperms) } else { if (errno == EXDEV) { char *av[4]; - warningx(_("%s and %s not on the same file system, using mv to rename"), + warningx(U_("%s and %s not on the same file system, using mv to rename"), sp->tpath, sp->path); /* Build up argument vector for the command */ @@ -629,7 +633,7 @@ install_sudoers(struct sudoersfile *sp, bool oldperms) /* And run it... */ if (run_command(_PATH_MV, av)) { - warningx(_("command failed: '%s %s %s', %s unchanged"), + warningx(U_("command failed: '%s %s %s', %s unchanged"), _PATH_MV, sp->tpath, sp->path, sp->path); (void) unlink(sp->tpath); efree(sp->tpath); @@ -639,7 +643,7 @@ install_sudoers(struct sudoersfile *sp, bool oldperms) efree(sp->tpath); sp->tpath = NULL; } else { - warning(_("error renaming %s, %s unchanged"), sp->tpath, sp->path); + warning(U_("error renaming %s, %s unchanged"), sp->tpath, sp->path); (void) unlink(sp->tpath); goto done; } @@ -651,13 +655,6 @@ done: /* STUB */ void -set_fqdn(void) -{ - return; -} - -/* STUB */ -void init_envtables(void) { return; @@ -691,6 +688,12 @@ group_plugin_query(const char *user, const char *group return false; } +/* STUB */ +struct interface *get_interfaces(void) +{ + return NULL; +} + /* * Assuming a parse error occurred, prompt the user for what they want * to do now. Returns the first letter of their choice. @@ -736,7 +739,7 @@ setup_signals(void) /* * Setup signal handlers to cleanup nicely. */ - zero_bytes(&sa, sizeof(sa)); + memset(&sa, 0, sizeof(sa)); sigemptyset(&sa.sa_mask); sa.sa_flags = SA_RESTART; sa.sa_handler = quit; @@ -757,14 +760,14 @@ run_command(char *path, char **argv) switch (pid = sudo_debug_fork()) { case -1: - error(1, _("unable to execute %s"), path); + fatal(U_("unable to execute %s"), path); break; /* NOTREACHED */ case 0: sudo_endpwent(); sudo_endgrent(); closefrom(STDERR_FILENO + 1); execv(path, argv); - warning(_("unable to run %s"), path); + warning(U_("unable to run %s"), path); _exit(127); break; /* NOTREACHED */ } @@ -812,17 +815,17 @@ check_syntax(char *sudoers_path, bool quiet, bool stri debug_decl(check_syntax, SUDO_DEBUG_UTIL) if (strcmp(sudoers_path, "-") == 0) { - yyin = stdin; + sudoersin = stdin; sudoers_path = "stdin"; - } else if ((yyin = fopen(sudoers_path, "r")) == NULL) { + } else if ((sudoersin = fopen(sudoers_path, "r")) == NULL) { if (!quiet) - warning(_("unable to open %s"), sudoers_path); + warning(U_("unable to open %s"), sudoers_path); goto done; } init_parser(sudoers_path, quiet); - if (yyparse() && !parse_error) { + if (sudoersparse() && !parse_error) { if (!quiet) - warningx(_("failed to parse %s file, unknown error"), sudoers_path); + warningx(U_("failed to parse %s file, unknown error"), sudoers_path); parse_error = true; errorfile = sudoers_path; } @@ -840,22 +843,26 @@ check_syntax(char *sudoers_path, bool quiet, bool stri if (errorlineno != -1) (void) printf(_("parse error in %s near line %d\n"), errorfile, errorlineno); - else + else if (errorfile != NULL) (void) printf(_("parse error in %s\n"), errorfile); } } else { struct sudoersfile *sp; /* Parsed OK, check mode and owner. */ - if (oldperms || check_owner(sudoers_path, quiet)) - (void) printf(_("%s: parsed OK\n"), sudoers_path); - else + if (oldperms || check_owner(sudoers_path, quiet)) { + if (!quiet) + (void) printf(_("%s: parsed OK\n"), sudoers_path); + } else { ok = false; - tq_foreach_fwd(&sudoerslist, sp) { - if (oldperms || check_owner(sp->path, quiet)) - (void) printf(_("%s: parsed OK\n"), sp->path); - else + } + TAILQ_FOREACH(sp, &sudoerslist, entries) { + if (oldperms || check_owner(sp->path, quiet)) { + if (!quiet) + (void) printf(_("%s: parsed OK\n"), sp->path); + } else { ok = false; + } } } @@ -881,7 +888,7 @@ open_sudoers(const char *path, bool doedit, bool *keep open_flags = O_RDWR | O_CREAT; /* Check for existing entry */ - tq_foreach_fwd(&sudoerslist, entry) { + TAILQ_FOREACH(entry, &sudoerslist, entries) { if (strcmp(path, entry->path) == 0) break; } @@ -889,8 +896,6 @@ open_sudoers(const char *path, bool doedit, bool *keep entry = ecalloc(1, sizeof(*entry)); entry->path = estrdup(path); /* entry->modified = 0; */ - entry->prev = entry; - /* entry->next = NULL; */ entry->fd = open(entry->path, open_flags, SUDOERS_MODE); /* entry->tpath = NULL; */ entry->doedit = doedit; @@ -900,18 +905,18 @@ open_sudoers(const char *path, bool doedit, bool *keep debug_return_ptr(NULL); } if (!checkonly && !lock_file(entry->fd, SUDO_TLOCK)) - errorx(1, _("%s busy, try again later"), entry->path); + fatalx(U_("%s busy, try again later"), entry->path); if ((fp = fdopen(entry->fd, "r")) == NULL) - error(1, "%s", entry->path); - tq_append(&sudoerslist, entry); + fatal("%s", entry->path); + TAILQ_INSERT_TAIL(&sudoerslist, entry, entries); } else { /* Already exists, open .tmp version if there is one. */ if (entry->tpath != NULL) { if ((fp = fopen(entry->tpath, "r")) == NULL) - error(1, "%s", entry->tpath); + fatal("%s", entry->tpath); } else { if ((fp = fdopen(entry->fd, "r")) == NULL) - error(1, "%s", entry->path); + fatal("%s", entry->path); rewind(fp); } } @@ -944,7 +949,7 @@ get_editor(char **args) } else { if (def_env_editor) { /* If we are honoring $EDITOR this is a fatal error. */ - errorx(1, _("specified editor (%s) doesn't exist"), UserEditor); + fatalx(U_("specified editor (%s) doesn't exist"), UserEditor); } else { /* Otherwise, just ignore $EDITOR. */ UserEditor = NULL; @@ -967,7 +972,7 @@ get_editor(char **args) if (stat(UserEditor, &user_editor_sb) != 0) { /* Should never happen since we already checked above. */ - error(1, _("unable to stat editor (%s)"), UserEditor); + fatal(U_("unable to stat editor (%s)"), UserEditor); } EditorPath = estrdup(def_editor); Editor = strtok(EditorPath, ":"); @@ -1015,7 +1020,7 @@ get_editor(char **args) /* Bleah, none of the editors existed! */ if (Editor == NULL || *Editor == '\0') - errorx(1, _("no editor found (editor path = %s)"), def_editor); + fatalx(U_("no editor found (editor path = %s)"), def_editor); } *args = EditorArgs; debug_return_str(Editor); @@ -1047,7 +1052,7 @@ get_args(char *cmnd) static void get_hostname(void) { - char *p, thost[MAXHOSTNAMELEN + 1]; + char *p, thost[HOST_NAME_MAX + 1]; debug_decl(get_hostname, SUDO_DEBUG_UTIL) if (gethostname(thost, sizeof(thost)) != -1) { @@ -1064,6 +1069,8 @@ get_hostname(void) } else { user_host = user_shost = "localhost"; } + user_runhost = user_host; + user_srunhost = user_shost; debug_return; } @@ -1075,18 +1082,15 @@ alias_remove_recursive(char *name, int type) bool rval = true; debug_decl(alias_remove_recursive, SUDO_DEBUG_ALIAS) - if ((a = alias_find(name, type)) != NULL) { - tq_foreach_fwd(&a->members, m) { + if ((a = alias_remove(name, type)) != NULL) { + TAILQ_FOREACH(m, &a->members, entries) { if (m->type == ALIAS) { if (!alias_remove_recursive(m->name, type)) rval = false; } } - } - alias_seqno++; - a = alias_remove(name, type); - if (a) rbinsert(alias_freelist, a); + } debug_return_bool(rval); } @@ -1098,28 +1102,30 @@ check_alias(char *name, int type, int strict, int quie int errors = 0; debug_decl(check_alias, SUDO_DEBUG_ALIAS) - if ((a = alias_find(name, type)) != NULL) { + if ((a = alias_get(name, type)) != NULL) { /* check alias contents */ - tq_foreach_fwd(&a->members, m) { + TAILQ_FOREACH(m, &a->members, entries) { if (m->type == ALIAS) errors += check_alias(m->name, type, strict, quiet); } + alias_put(a); } else { if (!quiet) { - char *fmt; if (errno == ELOOP) { - fmt = strict ? - _("Error: cycle in %s_Alias `%s'") : - _("Warning: cycle in %s_Alias `%s'"); + warningx(strict ? + U_("Error: cycle in %s_Alias `%s'") : + U_("Warning: cycle in %s_Alias `%s'"), + type == HOSTALIAS ? "Host" : type == CMNDALIAS ? "Cmnd" : + type == USERALIAS ? "User" : type == RUNASALIAS ? "Runas" : + "Unknown", name); } else { - fmt = strict ? - _("Error: %s_Alias `%s' referenced but not defined") : - _("Warning: %s_Alias `%s' referenced but not defined"); + warningx(strict ? + U_("Error: %s_Alias `%s' referenced but not defined") : + U_("Warning: %s_Alias `%s' referenced but not defined"), + type == HOSTALIAS ? "Host" : type == CMNDALIAS ? "Cmnd" : + type == USERALIAS ? "User" : type == RUNASALIAS ? "Runas" : + "Unknown", name); } - warningx(fmt, - type == HOSTALIAS ? "Host" : type == CMNDALIAS ? "Cmnd" : - type == USERALIAS ? "User" : type == RUNASALIAS ? "Runas" : - "Unknown", name); } errors++; } @@ -1135,7 +1141,7 @@ static int check_aliases(bool strict, bool quiet) { struct cmndspec *cs; - struct member *m, *binding; + struct member *m; struct privilege *priv; struct userspec *us; struct defaults *d; @@ -1145,29 +1151,34 @@ check_aliases(bool strict, bool quiet) alias_freelist = rbcreate(alias_compare); /* Forward check. */ - tq_foreach_fwd(&userspecs, us) { - tq_foreach_fwd(&us->users, m) { + TAILQ_FOREACH(us, &userspecs, entries) { + TAILQ_FOREACH(m, &us->users, entries) { if (m->type == ALIAS) { - alias_seqno++; errors += check_alias(m->name, USERALIAS, strict, quiet); } } - tq_foreach_fwd(&us->privileges, priv) { - tq_foreach_fwd(&priv->hostlist, m) { + TAILQ_FOREACH(priv, &us->privileges, entries) { + TAILQ_FOREACH(m, &priv->hostlist, entries) { if (m->type == ALIAS) { - alias_seqno++; errors += check_alias(m->name, HOSTALIAS, strict, quiet); } } - tq_foreach_fwd(&priv->cmndlist, cs) { - tq_foreach_fwd(&cs->runasuserlist, m) { - if (m->type == ALIAS) { - alias_seqno++; - errors += check_alias(m->name, RUNASALIAS, strict, quiet); + TAILQ_FOREACH(cs, &priv->cmndlist, entries) { + if (cs->runasuserlist != NULL) { + TAILQ_FOREACH(m, cs->runasuserlist, entries) { + if (m->type == ALIAS) { + errors += check_alias(m->name, RUNASALIAS, strict, quiet); + } } } + if (cs->runasgrouplist != NULL) { + TAILQ_FOREACH(m, cs->runasgrouplist, entries) { + if (m->type == ALIAS) { + errors += check_alias(m->name, RUNASALIAS, strict, quiet); + } + } + } if ((m = cs->cmnd)->type == ALIAS) { - alias_seqno++; errors += check_alias(m->name, CMNDALIAS, strict, quiet); } } @@ -1175,39 +1186,45 @@ check_aliases(bool strict, bool quiet) } /* Reverse check (destructive) */ - tq_foreach_fwd(&userspecs, us) { - tq_foreach_fwd(&us->users, m) { + TAILQ_FOREACH(us, &userspecs, entries) { + TAILQ_FOREACH(m, &us->users, entries) { if (m->type == ALIAS) { - alias_seqno++; if (!alias_remove_recursive(m->name, USERALIAS)) errors++; } } - tq_foreach_fwd(&us->privileges, priv) { - tq_foreach_fwd(&priv->hostlist, m) { + TAILQ_FOREACH(priv, &us->privileges, entries) { + TAILQ_FOREACH(m, &priv->hostlist, entries) { if (m->type == ALIAS) { - alias_seqno++; if (!alias_remove_recursive(m->name, HOSTALIAS)) errors++; } } - tq_foreach_fwd(&priv->cmndlist, cs) { - tq_foreach_fwd(&cs->runasuserlist, m) { - if (m->type == ALIAS) { - alias_seqno++; - if (!alias_remove_recursive(m->name, RUNASALIAS)) - errors++; + TAILQ_FOREACH(cs, &priv->cmndlist, entries) { + if (cs->runasuserlist != NULL) { + TAILQ_FOREACH(m, cs->runasuserlist, entries) { + if (m->type == ALIAS) { + if (!alias_remove_recursive(m->name, RUNASALIAS)) + errors++; + } } } + if (cs->runasgrouplist != NULL) { + TAILQ_FOREACH(m, cs->runasgrouplist, entries) { + if (m->type == ALIAS) { + if (!alias_remove_recursive(m->name, RUNASALIAS)) + errors++; + } + } + } if ((m = cs->cmnd)->type == ALIAS) { - alias_seqno++; if (!alias_remove_recursive(m->name, CMNDALIAS)) errors++; } } } } - tq_foreach_fwd(&defaults, d) { + TAILQ_FOREACH(d, &defaults, entries) { switch (d->type) { case DEFAULTS_HOST: atype = HOSTALIAS; @@ -1224,13 +1241,10 @@ check_aliases(bool strict, bool quiet) default: continue; /* not an alias */ } - tq_foreach_fwd(&d->binding, binding) { - for (m = binding; m != NULL; m = m->next) { - if (m->type == ALIAS) { - alias_seqno++; - if (!alias_remove_recursive(m->name, atype)) - errors++; - } + TAILQ_FOREACH(m, d->binding, entries) { + if (m->type == ALIAS) { + if (!alias_remove_recursive(m->name, atype)) + errors++; } } } @@ -1249,7 +1263,7 @@ print_unused(void *v1, void *v2) struct alias *a = (struct alias *)v1; char *prefix = (char *)v2; - warningx2(_("%s: unused %s_Alias %s"), prefix, + warningx_nodebug(U_("%s: unused %s_Alias %s"), prefix, a->type == HOSTALIAS ? "Host" : a->type == CMNDALIAS ? "Cmnd" : a->type == USERALIAS ? "User" : a->type == RUNASALIAS ? "Runas" : "Unknown", a->name); @@ -1259,19 +1273,17 @@ print_unused(void *v1, void *v2) /* * Unlink any sudoers temp files that remain. */ -void -cleanup(int gotsignal) +static void +visudo_cleanup(void) { struct sudoersfile *sp; - tq_foreach_fwd(&sudoerslist, sp) { + TAILQ_FOREACH(sp, &sudoerslist, entries) { if (sp->tpath != NULL) (void) unlink(sp->tpath); } - if (!gotsignal) { - sudo_endpwent(); - sudo_endgrent(); - } + sudo_endpwent(); + sudo_endgrent(); } /* @@ -1280,16 +1292,24 @@ cleanup(int gotsignal) static void quit(int signo) { - const char *signame, *myname; + struct sudoersfile *sp; + struct iovec iov[4]; - cleanup(signo); + TAILQ_FOREACH(sp, &sudoerslist, entries) { + if (sp->tpath != NULL) + (void) unlink(sp->tpath); + } + #define emsg " exiting due to signal: " - myname = getprogname(); - signame = strsignal(signo); - ignore_result(write(STDERR_FILENO, myname, strlen(myname))); - ignore_result(write(STDERR_FILENO, emsg, sizeof(emsg) - 1)); - ignore_result(write(STDERR_FILENO, signame, strlen(signame))); - ignore_result(write(STDERR_FILENO, "\n", 1)); + iov[0].iov_base = (char *)getprogname(); + iov[0].iov_len = strlen(iov[0].iov_base); + iov[1].iov_base = emsg; + iov[1].iov_len = sizeof(emsg) - 1; + iov[2].iov_base = strsignal(signo); + iov[2].iov_len = strlen(iov[2].iov_base); + iov[3].iov_base = "\n"; + iov[3].iov_len = 1; + ignore_result(writev(STDERR_FILENO, iov, 4)); _exit(signo); } @@ -1297,7 +1317,7 @@ static void usage(int fatal) { (void) fprintf(fatal ? stderr : stdout, - "usage: %s [-chqsV] [-f sudoers]\n", getprogname()); + "usage: %s [-chqsV] [-f sudoers] [-x file]\n", getprogname()); if (fatal) exit(1); } @@ -1308,36 +1328,12 @@ help(void) (void) printf(_("%s - safely edit the sudoers file\n\n"), getprogname()); usage(0); (void) puts(_("\nOptions:\n" - " -c check-only mode\n" - " -f sudoers specify sudoers file location\n" - " -h display help message and exit\n" - " -q less verbose (quiet) syntax error messages\n" - " -s strict syntax checking\n" - " -V display version information and exit")); + " -c, --check check-only mode\n" + " -f, --file=file specify sudoers file location\n" + " -h, --help display help message and exit\n" + " -q, --quiet less verbose (quiet) syntax error messages\n" + " -s, --strict strict syntax checking\n" + " -V, --version display version information and exit\n" + " -x, --export=file export sudoers in JSON format")); exit(0); -} - -static int -visudo_printf(int msg_type, const char *fmt, ...) -{ - va_list ap; - FILE *fp; - - switch (msg_type) { - case SUDO_CONV_INFO_MSG: - fp = stdout; - break; - case SUDO_CONV_ERROR_MSG: - fp = stderr; - break; - default: - errno = EINVAL; - return -1; - } - - va_start(ap, fmt); - vfprintf(fp, fmt, ap); - va_end(ap); - - return 0; }