X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=plugins%2Fsudoers%2Fsudoers.c;h=c06907cea6dcdbc05f96fb0f88edcc4766f1602a;hb=e8db7f6eea9b35527ddd4532affabd18a30549b5;hp=0399acd072fdf5da40202c4bdb2647f4f31b9f5b;hpb=98b9fd63cd28a3636a7cd24641b8f497eaadcd50;p=debian%2Fsudo

diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index 0399acd..c06907c 100644
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1993-1996, 1998-2011 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1993-1996, 1998-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
@@ -16,9 +16,6 @@
  * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- *
- * For a brief history of sudo, please see the HISTORY file included
- * with this distribution.
  */
 
 #define _SUDO_MAIN
@@ -31,7 +28,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <sys/socket.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
@@ -60,10 +56,6 @@
 #include <signal.h>
 #include <grp.h>
 #include <time.h>
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
-#include <netinet/in.h>
 #include <netdb.h>
 #ifdef HAVE_LOGIN_CAP_H
 # include <login_cap.h>
@@ -78,38 +70,34 @@
 # include <selinux/selinux.h>
 #endif
 #include <ctype.h>
-#include <setjmp.h>
 #ifndef HAVE_GETADDRINFO
 # include "compat/getaddrinfo.h"
 #endif
 
 #include "sudoers.h"
-#include "interfaces.h"
-#include "sudoers_version.h"
 #include "auth/sudo_auth.h"
 #include "secure_path.h"
 
 /*
  * Prototypes
  */
-static void init_vars(char * const *);
+static char *find_editor(int nfiles, char **files, char ***argv_out);
+static int cb_runas_default(const char *);
+static int cb_sudoers_locale(const char *);
 static int set_cmnd(void);
+static void create_admin_success_flag(void);
+static void init_vars(char * const *);
+static void set_fqdn(void);
 static void set_loginclass(struct passwd *);
-static void set_runaspw(const char *);
 static void set_runasgr(const char *);
-static int cb_runas_default(const char *);
-static int sudoers_policy_version(int verbose);
-static int deserialize_info(char * const args[], char * const settings[],
-    char * const user_info[]);
-static char *find_editor(int nfiles, char **files, char ***argv_out);
-static void create_admin_success_flag(void);
+static void set_runaspw(const char *);
+static bool tty_present(void);
 
 /*
  * Globals
  */
 struct sudo_user sudo_user;
 struct passwd *list_pw;
-struct interface *interfaces;
 int long_list;
 uid_t timestamp_uid;
 extern int errorlineno;
@@ -118,79 +106,40 @@ extern char *errorfile;
 #ifdef HAVE_BSD_AUTH_H
 char *login_style;
 #endif /* HAVE_BSD_AUTH_H */
-sudo_conv_t sudo_conv;
-sudo_printf_t sudo_printf;
 int sudo_mode;
 
-static int sudo_version;
 static char *prev_user;
 static char *runas_user;
 static char *runas_group;
 static struct sudo_nss_list *snl;
-static const char *interfaces_string;
-static sigaction_t saved_sa_int, saved_sa_quit, saved_sa_tstp;
 
 /* XXX - must be extern for audit bits of sudo_auth.c */
 int NewArgc;
 char **NewArgv;
 
-/* Declared here instead of plugin_error.c for static sudo builds. */
-sigjmp_buf error_jmp;
-
-static int
-sudoers_policy_open(unsigned int version, sudo_conv_t conversation,
-    sudo_printf_t plugin_printf, char * const settings[],
-    char * const user_info[], char * const envp[], char * const args[])
+int
+sudoers_policy_init(void *info, char * const envp[])
 {
     volatile int sources = 0;
-    sigaction_t sa;
-    struct sudo_nss *nss;
-    struct sudo_nss *nss_next;
-    debug_decl(sudoers_policy_open, SUDO_DEBUG_PLUGIN)
-
-    sudo_version = version;
-    if (!sudo_conv)
-	sudo_conv = conversation;
-    if (!sudo_printf)
-	sudo_printf = plugin_printf;
-
-    /* Plugin args are only specified for API version 1.2 and higher. */
-    if (sudo_version < SUDO_API_MKVERSION(1, 2))
-	args = NULL;
-
-    if (sigsetjmp(error_jmp, 1)) {
-	/* called via error(), errorx() or log_fatal() */
-	rewind_perms();
-	debug_return_bool(-1);
-    }
+    struct sudo_nss *nss, *nss_next;
+    debug_decl(sudoers_policy_init, SUDO_DEBUG_PLUGIN)
 
     bindtextdomain("sudoers", LOCALEDIR);
 
-    /*
-     * Signal setup:
-     *	Ignore keyboard-generated signals so the user cannot interrupt
-     *  us at some point and avoid the logging.
-     *  Install handler to wait for children when they exit.
-     */
-    zero_bytes(&sa, sizeof(sa));
-    sigemptyset(&sa.sa_mask);
-    sa.sa_flags = SA_RESTART;
-    sa.sa_handler = SIG_IGN;
-    (void) sigaction(SIGINT, &sa, &saved_sa_int);
-    (void) sigaction(SIGQUIT, &sa, &saved_sa_quit);
-    (void) sigaction(SIGTSTP, &sa, &saved_sa_tstp);
-
     sudo_setpwent();
     sudo_setgrent();
 
+    /* Register fatal/fatalx callback. */
+    fatal_callback_register(sudoers_cleanup);
+
     /* Initialize environment functions (including replacements). */
     env_init(envp);
 
     /* Setup defaults data structures. */
     init_defaults();
 
-    /* Parse args, settings and user_info */
-    sudo_mode = deserialize_info(args, settings, user_info);
+    /* Parse info from front-end. */
+    sudo_mode = sudoers_policy_deserialize_info(info, &runas_user, &runas_group);
 
     init_vars(envp);		/* XXX - move this later? */
 
@@ -207,7 +156,7 @@ sudoers_policy_open(unsigned int version, sudo_conv_t conversation,
         if (nss->open(nss) == 0 && nss->parse(nss) == 0) {
             sources++;
             if (nss->setdefs(nss) != 0)
-                log_error(NO_STDERR, _("problem with defaults entries"));
+                log_warning(NO_STDERR, N_("problem with defaults entries"));
         } else {
             tq_remove(snl, nss);
         }
@@ -232,6 +181,7 @@ sudoers_policy_open(unsigned int version, sudo_conv_t conversation,
      * Note that if runas_group was specified without runas_user we
      * defer setting runas_pw so the match routines know to ignore it.
      */
+    /* XXX - qpm4u does more here as it may have already set runas_pw */
     if (runas_group != NULL) {
 	set_runasgr(runas_group);
 	if (runas_user != NULL)
@@ -240,7 +190,7 @@ sudoers_policy_open(unsigned int version, sudo_conv_t conversation,
 	set_runaspw(runas_user ? runas_user : def_runas_default);
 
     if (!update_defaults(SETDEF_RUNAS))
-	log_error(NO_STDERR, _("problem with defaults entries"));
+	log_warning(NO_STDERR, N_("problem with defaults entries"));
 
     if (def_fqdn)
 	set_fqdn();	/* deferred until after sudoers is parsed */
@@ -253,79 +203,21 @@ sudoers_policy_open(unsigned int version, sudo_conv_t conversation,
     debug_return_bool(true);
 }
 
-static void
-sudoers_policy_close(int exit_status, int error_code)
-{
-    debug_decl(sudoers_policy_close, SUDO_DEBUG_PLUGIN)
-
-    if (sigsetjmp(error_jmp, 1)) {
-	/* called via error(), errorx() or log_fatal() */
-	debug_return;
-    }
-
-    /* We do not currently log the exit status. */
-    if (error_code)
-	warningx(_("unable to execute %s: %s"), safe_cmnd, strerror(error_code));
-
-    /* Close the session we opened in sudoers_policy_init_session(). */
-    if (ISSET(sudo_mode, MODE_RUN|MODE_EDIT))
-	(void)sudo_auth_end_session(runas_pw);
-
-    /* Free remaining references to password and group entries. */
-    sudo_pw_delref(sudo_user.pw);
-    sudo_user.pw = NULL;
-    sudo_pw_delref(runas_pw);
-    runas_pw = NULL;
-    if (runas_gr != NULL) {
-	sudo_gr_delref(runas_gr);
-	runas_gr = NULL;
-    }
-    if (user_group_list != NULL) {
-	sudo_grlist_delref(user_group_list);
-	user_group_list = NULL;
-    }
-    efree(user_gids);
-    user_gids = NULL;
-
-    debug_return;
-}
-
-/*
- * The init_session function is called before executing the command
- * and before uid/gid changes occur.
- * Returns 1 on success, 0 on failure and -1 on error.
- */
-static int
-sudoers_policy_init_session(struct passwd *pwd, char **user_env[])
-{
-    debug_decl(sudoers_policy_init, SUDO_DEBUG_PLUGIN)
-
-    /* user_env is only specified for API version 1.2 and higher. */
-    if (sudo_version < SUDO_API_MKVERSION(1, 2))
-	user_env = NULL;
-
-    if (sigsetjmp(error_jmp, 1)) {
-	/* called via error(), errorx() or log_fatal() */
-	debug_return_bool(-1);
-    }
-
-    debug_return_bool(sudo_auth_begin_session(pwd, user_env));
-}
-
-static int
+int
 sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
-    char **command_infop[], char **argv_out[], char **user_env_out[])
+    void *closure)
 {
-    static char *command_info[32]; /* XXX */
     char **edit_argv = NULL;
+    char *iolog_path = NULL;
+    mode_t cmnd_umask = 0777;
     struct sudo_nss *nss;
-    int cmnd_status = -1, validated;
-    volatile int info_len = 0;
+    int cmnd_status = -1, oldlocale, validated;
     volatile int rval = true;
     debug_decl(sudoers_policy_main, SUDO_DEBUG_PLUGIN)
 
-    if (sigsetjmp(error_jmp, 1)) {
-	/* error recovery via error(), errorx() or log_fatal() */
+    /* XXX - would like to move this to policy.c but need the cleanup. */
+    if (fatal_setjmp() != 0) {
+	/* error recovery via fatal(), fatalx() or log_fatal() */
 	rval = -1;
 	goto done;
     }
@@ -377,17 +269,10 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
     /* Find command in path */
     cmnd_status = set_cmnd();
 
-#ifdef HAVE_SETLOCALE
-    if (!setlocale(LC_ALL, def_sudoers_locale)) {
-	warningx(_("unable to set locale to \"%s\", using \"C\""),
-	    def_sudoers_locale);
-	setlocale(LC_ALL, "C");
-    }
-#endif
-
     /*
-     * Check sudoers sources.
+     * Check sudoers sources, using the locale specified in sudoers.
      */
+    sudoers_setlocale(SUDOERS_LOCALE_SUDOERS, &oldlocale);
     validated = FLAG_NO_USER | FLAG_NO_HOST;
     tq_foreach_fwd(snl, nss) {
 	validated = nss->lookup(nss, validated, pwflag);
@@ -403,13 +288,12 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
 	}
     }
 
+    /* Restore user's locale. */
+    sudoers_setlocale(oldlocale, NULL);
+
     if (safe_cmnd == NULL)
 	safe_cmnd = estrdup(user_cmnd);
 
-#ifdef HAVE_SETLOCALE
-    setlocale(LC_ALL, "");
-#endif
-
     /* If only a group was specified, set runas_pw based on invoking user. */
     if (runas_pw == NULL)
 	set_runaspw(user_name);
@@ -428,7 +312,7 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
 	    timestamp_uid = pw->pw_uid;
 	    sudo_pw_delref(pw);
 	} else {
-	    log_error(0, _("timestamp owner (%s): No such user"),
+	    log_warning(0, N_("timestamp owner (%s): No such user"),
 		def_timestampowner);
 	    timestamp_uid = ROOT_UID;
 	}
@@ -441,14 +325,10 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
     }
 
     /* Bail if a tty is required and we don't have one.  */
-    if (def_requiretty) {
-	int fd = open(_PATH_TTY, O_RDWR|O_NOCTTY);
-	if (fd == -1) {
-	    audit_failure(NewArgv, _("no tty"));
-	    warningx(_("sorry, you must have a tty to run sudo"));
-	    goto bad;
-	} else
-	    (void) close(fd);
+    if (def_requiretty && !tty_present()) {
+	audit_failure(NewArgv, N_("no tty"));
+	warningx(_("sorry, you must have a tty to run sudo"));
+	goto bad;
     }
 
     /*
@@ -495,12 +375,17 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
 
     /* Finally tell the user if the command did not exist. */
     if (cmnd_status == NOT_FOUND_DOT) {
-	audit_failure(NewArgv, _("command in current directory"));
+	audit_failure(NewArgv, N_("command in current directory"));
 	warningx(_("ignoring `%s' found in '.'\nUse `sudo ./%s' if this is the `%s' you wish to run."), user_cmnd, user_cmnd, user_cmnd);
 	goto bad;
     } else if (cmnd_status == NOT_FOUND) {
-	audit_failure(NewArgv, _("%s: command not found"), user_cmnd);
-	warningx(_("%s: command not found"), user_cmnd);
+	if (ISSET(sudo_mode, MODE_CHECK)) {
+	    audit_failure(NewArgv, N_("%s: command not found"), NewArgv[0]);
+	    warningx(_("%s: command not found"), NewArgv[0]);
+	} else {
+	    audit_failure(NewArgv, N_("%s: command not found"), user_cmnd);
+	    warningx(_("%s: command not found"), user_cmnd);
+	}
 	goto bad;
     }
 
@@ -513,23 +398,13 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
 	    validate_env_vars(sudo_user.env_vars);
     }
 
-    if (ISSET(sudo_mode, (MODE_RUN | MODE_EDIT)) && (def_log_input || def_log_output)) {
-	if (def_iolog_file && def_iolog_dir) {
-	    command_info[info_len++] = expand_iolog_path("iolog_path=",
-		def_iolog_dir, def_iolog_file, &sudo_user.iolog_file);
+    if (ISSET(sudo_mode, (MODE_RUN | MODE_EDIT))) {
+	if ((def_log_input || def_log_output) && def_iolog_file && def_iolog_dir) {
+	    const char prefix[] = "iolog_path=";
+	    iolog_path = expand_iolog_path(prefix, def_iolog_dir,
+		def_iolog_file, &sudo_user.iolog_file);
 	    sudo_user.iolog_file++;
 	}
-	if (def_log_input) {
-	    command_info[info_len++] = estrdup("iolog_stdin=true");
-	    command_info[info_len++] = estrdup("iolog_ttyin=true");
-	}
-	if (def_log_output) {
-	    command_info[info_len++] = estrdup("iolog_stdout=true");
-	    command_info[info_len++] = estrdup("iolog_stderr=true");
-	    command_info[info_len++] = estrdup("iolog_ttyout=true");
-	}
-	if (def_compress_io)
-	    command_info[info_len++] = estrdup("iolog_compress=true");
     }
 
     log_allowed(validated);
@@ -556,13 +431,9 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
      * unless umask_override is set.
      */
     if (def_umask != 0777) {
-	mode_t mask = def_umask;
-	if (!def_umask_override) {
-	    mode_t omask = umask(mask);
-	    mask |= omask;
-	    umask(omask);
-	}
-	easprintf(&command_info[info_len++], "umask=0%o", (unsigned int)mask);
+	cmnd_umask = def_umask;
+	if (!def_umask_override)
+	    cmnd_umask |= user_umask;
     }
 
     if (ISSET(sudo_mode, MODE_LOGIN_SHELL)) {
@@ -574,9 +445,6 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
 	*p = '-';
 	NewArgv[0] = p;
 
-	/* Set cwd to run user's homedir. */
-	command_info[info_len++] = fmt_string("cwd", runas_pw->pw_dir);
-
 	/*
 	 * Newer versions of bash require the --login option to be used
 	 * in conjunction with the -c option even if the shell name starts
@@ -615,108 +483,21 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
     /* Insert user-specified environment variables. */
     insert_env_vars(sudo_user.env_vars);
 
-    /* Restore signal handlers before we exec. */
-    (void) sigaction(SIGINT, &saved_sa_int, NULL);
-    (void) sigaction(SIGQUIT, &saved_sa_quit, NULL);
-    (void) sigaction(SIGTSTP, &saved_sa_tstp, NULL);
-
     if (ISSET(sudo_mode, MODE_EDIT)) {
-	char *editor = find_editor(NewArgc - 1, NewArgv + 1, &edit_argv);
-	if (editor == NULL)
+	efree(safe_cmnd);
+	safe_cmnd = find_editor(NewArgc - 1, NewArgv + 1, &edit_argv);
+	if (safe_cmnd == NULL)
 	    goto bad;
-	command_info[info_len++] = fmt_string("command", editor);
-	command_info[info_len++] = estrdup("sudoedit=true");
-    } else {
-	command_info[info_len++] = fmt_string("command", safe_cmnd);
     }
-    if (def_stay_setuid) {
-	easprintf(&command_info[info_len++], "runas_uid=%u",
-	    (unsigned int)user_uid);
-	easprintf(&command_info[info_len++], "runas_gid=%u",
-	    (unsigned int)user_gid);
-	easprintf(&command_info[info_len++], "runas_euid=%u",
-	    (unsigned int)runas_pw->pw_uid);
-	easprintf(&command_info[info_len++], "runas_egid=%u",
-	    runas_gr ? (unsigned int)runas_gr->gr_gid :
-	    (unsigned int)runas_pw->pw_gid);
-    } else {
-	easprintf(&command_info[info_len++], "runas_uid=%u",
-	    (unsigned int)runas_pw->pw_uid);
-	easprintf(&command_info[info_len++], "runas_gid=%u",
-	    runas_gr ? (unsigned int)runas_gr->gr_gid :
-	    (unsigned int)runas_pw->pw_gid);
-    }
-    if (def_preserve_groups) {
-	command_info[info_len++] = "preserve_groups=true";
-    } else {
-	int i, len;
-	gid_t egid;
-	size_t glsize;
-	char *cp, *gid_list;
-	struct group_list *grlist = sudo_get_grlist(runas_pw);
-
-	/* We reserve an extra spot in the list for the effective gid. */
-	glsize = sizeof("runas_groups=") - 1 +
-	    ((grlist->ngids + 1) * (MAX_UID_T_LEN + 1));
-	gid_list = emalloc(glsize);
-	memcpy(gid_list, "runas_groups=", sizeof("runas_groups=") - 1);
-	cp = gid_list + sizeof("runas_groups=") - 1;
-
-	/* On BSD systems the effective gid is the first group in the list. */
-	egid = runas_gr ? (unsigned int)runas_gr->gr_gid :
-	    (unsigned int)runas_pw->pw_gid;
-	len = snprintf(cp, glsize - (cp - gid_list), "%u", egid);
-	if (len < 0 || len >= glsize - (cp - gid_list))
-	    errorx(1, _("internal error, %s overflow"), "runas_groups");
-	cp += len;
-	for (i = 0; i < grlist->ngids; i++) {
-	    if (grlist->gids[i] != egid) {
-		len = snprintf(cp, glsize - (cp - gid_list), ",%u",
-		     (unsigned int) grlist->gids[i]);
-		if (len < 0 || len >= glsize - (cp - gid_list))
-		    errorx(1, _("internal error, %s overflow"), "runas_groups");
-		cp += len;
-	    }
-	}
-	command_info[info_len++] = gid_list;
-	sudo_grlist_delref(grlist);
-    }
-    if (def_closefrom >= 0)
-	easprintf(&command_info[info_len++], "closefrom=%d", def_closefrom);
-    if (def_noexec)
-	command_info[info_len++] = estrdup("noexec=true");
-    if (def_set_utmp)
-	command_info[info_len++] = estrdup("set_utmp=true");
-    if (def_use_pty)
-	command_info[info_len++] = estrdup("use_pty=true");
-    if (def_utmp_runas)
-	command_info[info_len++] = fmt_string("utmp_user", runas_pw->pw_name);
-#ifdef HAVE_LOGIN_CAP_H
-    if (def_use_loginclass)
-	command_info[info_len++] = fmt_string("login_class", login_class);
-#endif /* HAVE_LOGIN_CAP_H */
-#ifdef HAVE_SELINUX
-    if (user_role != NULL)
-	command_info[info_len++] = fmt_string("selinux_role", user_role);
-    if (user_type != NULL)
-	command_info[info_len++] = fmt_string("selinux_type", user_type);
-#endif /* HAVE_SELINUX */
-#ifdef HAVE_PRIV_SET
-    if (runas_privs != NULL)
-	command_info[info_len++] = fmt_string("runas_privs", runas_privs);
-    if (runas_limitprivs != NULL)
-	command_info[info_len++] = fmt_string("runas_limitprivs", runas_limitprivs);
-#endif /* HAVE_SELINUX */
 
     /* Must audit before uid change. */
     audit_success(NewArgv);
 
-    *command_infop = command_info;
-
-    *argv_out = edit_argv ? edit_argv : NewArgv;
+    /* Setup execution environment to pass back to front-end. */
+    rval = sudoers_policy_exec_setup(edit_argv ? edit_argv : NewArgv,
+	env_get(), cmnd_umask, iolog_path, closure);
 
-    /* Get private version of the environment and zero out stashed copy. */
-    *user_env_out = env_get();
+    /* Zero out stashed copy of environment, it is owned by the front-end. */
     env_init(NULL);
 
     goto done;
@@ -725,6 +506,7 @@ bad:
     rval = false;
 
 done:
+    fatal_disable_setjmp();
     rewind_perms();
 
     /* Close the password and group files and free up memory. */
@@ -734,77 +516,8 @@ done:
     debug_return_bool(rval);
 }
 
-static int
-sudoers_policy_check(int argc, char * const argv[], char *env_add[],
-    char **command_infop[], char **argv_out[], char **user_env_out[])
-{
-    debug_decl(sudoers_policy_check, SUDO_DEBUG_PLUGIN)
-
-    if (!ISSET(sudo_mode, MODE_EDIT))
-	SET(sudo_mode, MODE_RUN);
-
-    debug_return_bool(sudoers_policy_main(argc, argv, 0, env_add, command_infop,
-	argv_out, user_env_out));
-}
-
-static int
-sudoers_policy_validate(void)
-{
-    debug_decl(sudoers_policy_validate, SUDO_DEBUG_PLUGIN)
-
-    user_cmnd = "validate";
-    SET(sudo_mode, MODE_VALIDATE);
-
-    debug_return_bool(sudoers_policy_main(0, NULL, I_VERIFYPW, NULL, NULL, NULL, NULL));
-}
-
-static void
-sudoers_policy_invalidate(int remove)
-{
-    debug_decl(sudoers_policy_invalidate, SUDO_DEBUG_PLUGIN)
-
-    user_cmnd = "kill";
-    if (sigsetjmp(error_jmp, 1) == 0) {
-	remove_timestamp(remove);
-	plugin_cleanup(0);
-    }
-
-    debug_return;
-}
-
-static int
-sudoers_policy_list(int argc, char * const argv[], int verbose,
-    const char *list_user)
-{
-    int rval;
-    debug_decl(sudoers_policy_list, SUDO_DEBUG_PLUGIN)
-
-    user_cmnd = "list";
-    if (argc)
-	SET(sudo_mode, MODE_CHECK);
-    else
-	SET(sudo_mode, MODE_LIST);
-    if (verbose)
-	long_list = 1;
-    if (list_user) {
-	list_pw = sudo_getpwnam(list_user);
-	if (list_pw == NULL) {
-	    warningx(_("unknown user: %s"), list_user);
-	    debug_return_bool(-1);
-	}
-    }
-    rval = sudoers_policy_main(argc, argv, I_LISTPW, NULL, NULL, NULL, NULL);
-    if (list_user) {
-	sudo_pw_delref(list_pw);
-	list_pw = NULL;
-    }
-
-    debug_return_bool(rval);
-}
-
 /*
- * Initialize timezone, set umask, fill in ``sudo_user'' struct and
- * load the ``interfaces'' array.
+ * Initialize timezone and fill in ``sudo_user'' struct.
  */
 static void
 init_vars(char * const envp[])
@@ -812,9 +525,7 @@ init_vars(char * const envp[])
     char * const * ep;
     debug_decl(init_vars, SUDO_DEBUG_PLUGIN)
 
-#ifdef HAVE_TZSET
-    (void) tzset();		/* set the timezone if applicable */
-#endif /* HAVE_TZSET */
+    sudoers_initlocale(setlocale(LC_ALL, NULL), def_sudoers_locale);
 
     for (ep = envp; *ep; ep++) {
 	/* XXX - don't fill in if empty string */
@@ -837,23 +548,24 @@ init_vars(char * const envp[])
     }
 
     /*
-     * Get a local copy of the user's struct passwd with the shadow password
-     * if necessary.  It is assumed that euid is 0 at this point so we
-     * can read the shadow passwd file if necessary.
+     * Get a local copy of the user's struct passwd if we don't already
+     * have one.
      */
-    if ((sudo_user.pw = sudo_getpwuid(user_uid)) == NULL) {
-	/*
-	 * It is not unusual for users to place "sudo -k" in a .logout
-	 * file which can cause sudo to be run during reboot after the
-	 * YP/NIS/NIS+/LDAP/etc daemon has died.
-	 */
-	if (sudo_mode == MODE_KILL || sudo_mode == MODE_INVALIDATE)
-	    errorx(1, _("unknown uid: %u"), (unsigned int) user_uid);
+    if (sudo_user.pw == NULL) {
+	if ((sudo_user.pw = sudo_getpwnam(user_name)) == NULL) {
+	    /*
+	     * It is not unusual for users to place "sudo -k" in a .logout
+	     * file which can cause sudo to be run during reboot after the
+	     * YP/NIS/NIS+/LDAP/etc daemon has died.
+	     */
+	    if (sudo_mode == MODE_KILL || sudo_mode == MODE_INVALIDATE)
+		fatalx(_("unknown uid: %u"), (unsigned int) user_uid);
 
-	/* Need to make a fake struct passwd for the call to log_fatal(). */
-	sudo_user.pw = sudo_fakepwnamid(user_name, user_uid, user_gid);
-	log_fatal(0, _("unknown uid: %u"), (unsigned int) user_uid);
-	/* NOTREACHED */
+	    /* Need to make a fake struct passwd for the call to log_fatal(). */
+	    sudo_user.pw = sudo_mkpwent(user_name, user_uid, user_gid, NULL, NULL);
+	    log_fatal(0, N_("unknown uid: %u"), (unsigned int) user_uid);
+	    /* NOTREACHED */
+	}
     }
 
     /*
@@ -865,6 +577,12 @@ init_vars(char * const envp[])
     /* Set runas callback. */
     sudo_defs_table[I_RUNAS_DEFAULT].callback = cb_runas_default;
 
+    /* Set locale callback. */
+    sudo_defs_table[I_SUDOERS_LOCALE].callback = cb_sudoers_locale;
+
+    /* Set maxseq callback. */
+    sudo_defs_table[I_MAXSEQ].callback = io_set_max_sessid;
+
     /* It is now safe to use log_fatal() and set_perms() */
     debug_return;
 }
@@ -933,7 +651,7 @@ set_cmnd(void)
 		for (to = user_args, av = NewArgv + 1; *av; av++) {
 		    n = strlcpy(to, *av, size - (to - user_args));
 		    if (n >= size - (to - user_args))
-			errorx(1, _("internal error, %s overflow"), "set_cmnd()");
+			fatalx(_("internal error, %s overflow"), "set_cmnd()");
 		    to += n;
 		    *to++ = ' ';
 		}
@@ -941,8 +659,10 @@ set_cmnd(void)
 	    }
 	}
     }
-    if (strlen(user_cmnd) >= PATH_MAX)
-	errorx(1, _("%s: %s"), user_cmnd, strerror(ENAMETOOLONG));
+    if (strlen(user_cmnd) >= PATH_MAX) {
+	errno = ENAMETOOLONG;
+	fatal("%s", user_cmnd);
+    }
 
     if ((user_base = strrchr(user_cmnd, '/')) != NULL)
 	user_base++;
@@ -950,7 +670,7 @@ set_cmnd(void)
 	user_base = user_cmnd;
 
     if (!update_defaults(SETDEF_CMND))
-	log_error(NO_STDERR, _("problem with defaults entries"));
+	log_warning(NO_STDERR, N_("problem with defaults entries"));
 
     debug_return_int(rval);
 }
@@ -985,10 +705,10 @@ open_sudoers(const char *sudoers, bool doedit, bool *keepopen)
 	     * the user with a reasonable error message (unlike the lexer).
 	     */
 	    if ((fp = fopen(sudoers, "r")) == NULL) {
-		log_error(USE_ERRNO, _("unable to open %s"), sudoers);
+		log_warning(USE_ERRNO, N_("unable to open %s"), sudoers);
 	    } else {
 		if (sb.st_size != 0 && fgetc(fp) == EOF) {
-		    log_error(USE_ERRNO, _("unable to read %s"),
+		    log_warning(USE_ERRNO, N_("unable to read %s"),
 			sudoers);
 		    fclose(fp);
 		    fp = NULL;
@@ -1000,20 +720,20 @@ open_sudoers(const char *sudoers, bool doedit, bool *keepopen)
 	    }
 	    break;
 	case SUDO_PATH_MISSING:
-	    log_error(USE_ERRNO, _("unable to stat %s"), sudoers);
+	    log_warning(USE_ERRNO, N_("unable to stat %s"), sudoers);
 	    break;
 	case SUDO_PATH_BAD_TYPE:
-	    log_error(0, _("%s is not a regular file"), sudoers);
+	    log_warning(0, N_("%s is not a regular file"), sudoers);
 	    break;
 	case SUDO_PATH_WRONG_OWNER:
-	    log_error(0, _("%s is owned by uid %u, should be %u"),
+	    log_warning(0, N_("%s is owned by uid %u, should be %u"),
 		sudoers, (unsigned int) sb.st_uid, (unsigned int) sudoers_uid);
 	    break;
 	case SUDO_PATH_WORLD_WRITABLE:
-	    log_error(0, _("%s is world writable"), sudoers);
+	    log_warning(0, N_("%s is world writable"), sudoers);
 	    break;
 	case SUDO_PATH_GROUP_WRITABLE:
-	    log_error(0, _("%s is owned by gid %u, should be %u"),
+	    log_warning(0, N_("%s is owned by gid %u, should be %u"),
 		sudoers, (unsigned int) sb.st_gid, (unsigned int) sudoers_gid);
 	    break;
 	default:
@@ -1040,7 +760,7 @@ set_loginclass(struct passwd *pw)
     if (login_class && strcmp(login_class, "-") != 0) {
 	if (user_uid != 0 &&
 	    strcmp(runas_user ? runas_user : def_runas_default, "root") != 0)
-	    errorx(1, _("only root can use `-c %s'"), login_class);
+	    fatalx(_("only root can use `-c %s'"), login_class);
     } else {
 	login_class = pw->pw_class;
 	if (!login_class || !*login_class)
@@ -1057,9 +777,9 @@ set_loginclass(struct passwd *pw)
 	 * corrupted we want the admin to be able to use sudo to fix it.
 	 */
 	if (login_class)
-	    log_fatal(errflags, _("unknown login class: %s"), login_class);
+	    log_fatal(errflags, N_("unknown login class: %s"), login_class);
 	else
-	    log_error(errflags, _("unknown login class: %s"), login_class);
+	    log_warning(errflags, N_("unknown login class: %s"), login_class);
 	def_use_loginclass = false;
     }
     login_close(lc);
@@ -1080,7 +800,7 @@ set_loginclass(struct passwd *pw)
  * Look up the fully qualified domain name and set user_host and user_shost.
  * Use AI_FQDN if available since "canonical" is not always the same as fqdn.
  */
-void
+static void
 set_fqdn(void)
 {
     struct addrinfo *res0, hint;
@@ -1091,7 +811,7 @@ set_fqdn(void)
     hint.ai_family = PF_UNSPEC;
     hint.ai_flags = AI_FQDN;
     if (getaddrinfo(user_host, NULL, &hint, &res0) != 0) {
-	log_error(MSG_ONLY, _("unable to resolve host %s"), user_host);
+	log_warning(MSG_ONLY, N_("unable to resolve host %s"), user_host);
     } else {
 	if (user_shost != user_host)
 	    efree(user_shost);
@@ -1122,7 +842,7 @@ set_runaspw(const char *user)
 	    runas_pw = sudo_fakepwnam(user, runas_gr ? runas_gr->gr_gid : 0);
     } else {
 	if ((runas_pw = sudo_getpwnam(user)) == NULL)
-	    log_fatal(NO_MAIL|MSG_ONLY, _("unknown user: %s"), user);
+	    log_fatal(NO_MAIL|MSG_ONLY, N_("unknown user: %s"), user);
     }
     debug_return;
 }
@@ -1143,7 +863,7 @@ set_runasgr(const char *group)
 	    runas_gr = sudo_fakegrnam(group);
     } else {
 	if ((runas_gr = sudo_getgrnam(group)) == NULL)
-	    log_fatal(NO_MAIL|MSG_ONLY, _("unknown group: %s"), group);
+	    log_fatal(NO_MAIL|MSG_ONLY, N_("unknown group: %s"), group);
     }
     debug_return;
 }
@@ -1161,317 +881,48 @@ cb_runas_default(const char *user)
 }
 
 /*
- * Cleanup hook for error()/errorx()
+ * Callback for sudoers_locale sudoers setting.
  */
-void
-plugin_cleanup(int gotsignal)
-{
-    struct sudo_nss *nss;
-
-    if (!gotsignal) {
-	debug_decl(plugin_cleanup, SUDO_DEBUG_PLUGIN)
-	if (snl != NULL) {
-	    tq_foreach_fwd(snl, nss)
-		nss->close(nss);
-	}
-	if (def_group_plugin)
-	    group_plugin_unload();
-	sudo_endpwent();
-	sudo_endgrent();
-	debug_return;
-    }
-}
-
 static int
-sudoers_policy_version(int verbose)
+cb_sudoers_locale(const char *locale)
 {
-    debug_decl(sudoers_policy_version, SUDO_DEBUG_PLUGIN)
-
-    if (sigsetjmp(error_jmp, 1)) {
-	/* error recovery via error(), errorx() or log_fatal() */
-	debug_return_bool(-1);
-    }
-
-    sudo_printf(SUDO_CONV_INFO_MSG, _("Sudoers policy plugin version %s\n"),
-	PACKAGE_VERSION);
-    sudo_printf(SUDO_CONV_INFO_MSG, _("Sudoers file grammar version %d\n"),
-	SUDOERS_GRAMMAR_VERSION);
-
-    if (verbose) {
-	sudo_printf(SUDO_CONV_INFO_MSG, _("\nSudoers path: %s\n"), sudoers_file);
-#ifdef HAVE_LDAP
-# ifdef _PATH_NSSWITCH_CONF
-	sudo_printf(SUDO_CONV_INFO_MSG, _("nsswitch path: %s\n"), _PATH_NSSWITCH_CONF);
-# endif
-	sudo_printf(SUDO_CONV_INFO_MSG, _("ldap.conf path: %s\n"), _PATH_LDAP_CONF);
-	sudo_printf(SUDO_CONV_INFO_MSG, _("ldap.secret path: %s\n"), _PATH_LDAP_SECRET);
-#endif
-	dump_auth_methods();
-	dump_defaults();
-	sudo_printf(SUDO_CONV_INFO_MSG, "\n");
-	if (interfaces_string != NULL) {
-	    dump_interfaces(interfaces_string);
-	    sudo_printf(SUDO_CONV_INFO_MSG, "\n");
-	}
-    }
-    debug_return_bool(true);
+    sudoers_initlocale(NULL, locale);
+    return true;
 }
 
-static int
-deserialize_info(char * const args[], char * const settings[], char * const user_info[])
+/*
+ * Cleanup hook for fatal()/fatalx()
+ */
+void
+sudoers_cleanup(void)
 {
-    char * const *cur;
-    const char *p, *groups = NULL;
-    const char *debug_flags = NULL;
-    int flags = 0;
-    debug_decl(deserialize_info, SUDO_DEBUG_PLUGIN)
-
-#define MATCHES(s, v) (strncmp(s, v, sizeof(v) - 1) == 0)
-
-    /* Parse sudo.conf plugin args. */
-    if (args != NULL) {
-	for (cur = args; *cur != NULL; cur++) {
-	    if (MATCHES(*cur, "sudoers_file=")) {
-		sudoers_file = *cur + sizeof("sudoers_file=") - 1;
-		continue;
-	    }
-	    if (MATCHES(*cur, "sudoers_uid=")) {
-		sudoers_uid = (uid_t) atoi(*cur + sizeof("sudoers_uid=") - 1);
-		continue;
-	    }
-	    if (MATCHES(*cur, "sudoers_gid=")) {
-		sudoers_gid = (gid_t) atoi(*cur + sizeof("sudoers_gid=") - 1);
-		continue;
-	    }
-	    if (MATCHES(*cur, "sudoers_mode=")) {
-		sudoers_mode = (mode_t) strtol(*cur + sizeof("sudoers_mode=") - 1,
-		    NULL, 8);
-		continue;
-	    }
-	}
-    }
-
-    /* Parse command line settings. */
-    user_closefrom = -1;
-    for (cur = settings; *cur != NULL; cur++) {
-	if (MATCHES(*cur, "closefrom=")) {
-	    user_closefrom = atoi(*cur + sizeof("closefrom=") - 1);
-	    continue;
-	}
-	if (MATCHES(*cur, "debug_flags=")) {
-	    debug_flags = *cur + sizeof("debug_flags=") - 1;
-	    continue;
-	}
-	if (MATCHES(*cur, "runas_user=")) {
-	    runas_user = *cur + sizeof("runas_user=") - 1;
-	    sudo_user.flags |= RUNAS_USER_SPECIFIED;
-	    continue;
-	}
-	if (MATCHES(*cur, "runas_group=")) {
-	    runas_group = *cur + sizeof("runas_group=") - 1;
-	    sudo_user.flags |= RUNAS_GROUP_SPECIFIED;
-	    continue;
-	}
-	if (MATCHES(*cur, "prompt=")) {
-	    user_prompt = *cur + sizeof("prompt=") - 1;
-	    def_passprompt_override = true;
-	    continue;
-	}
-	if (MATCHES(*cur, "set_home=")) {
-	    if (atobool(*cur + sizeof("set_home=") - 1) == true)
-		SET(flags, MODE_RESET_HOME);
-	    continue;
-	}
-	if (MATCHES(*cur, "preserve_environment=")) {
-	    if (atobool(*cur + sizeof("preserve_environment=") - 1) == true)
-		SET(flags, MODE_PRESERVE_ENV);
-	    continue;
-	}
-	if (MATCHES(*cur, "run_shell=")) {
-	    if (atobool(*cur + sizeof("run_shell=") - 1) == true)
-		SET(flags, MODE_SHELL);
-	    continue;
-	}
-	if (MATCHES(*cur, "login_shell=")) {
-	    if (atobool(*cur + sizeof("login_shell=") - 1) == true) {
-		SET(flags, MODE_LOGIN_SHELL);
-		def_env_reset = true;
-	    }
-	    continue;
-	}
-	if (MATCHES(*cur, "implied_shell=")) {
-	    if (atobool(*cur + sizeof("implied_shell=") - 1) == true)
-		SET(flags, MODE_IMPLIED_SHELL);
-	    continue;
-	}
-	if (MATCHES(*cur, "preserve_groups=")) {
-	    if (atobool(*cur + sizeof("preserve_groups=") - 1) == true)
-		SET(flags, MODE_PRESERVE_GROUPS);
-	    continue;
-	}
-	if (MATCHES(*cur, "ignore_ticket=")) {
-	    if (atobool(*cur + sizeof("ignore_ticket=") - 1) == true)
-		SET(flags, MODE_IGNORE_TICKET);
-	    continue;
-	}
-	if (MATCHES(*cur, "noninteractive=")) {
-	    if (atobool(*cur + sizeof("noninteractive=") - 1) == true)
-		SET(flags, MODE_NONINTERACTIVE);
-	    continue;
-	}
-	if (MATCHES(*cur, "sudoedit=")) {
-	    if (atobool(*cur + sizeof("sudoedit=") - 1) == true)
-		SET(flags, MODE_EDIT);
-	    continue;
-	}
-	if (MATCHES(*cur, "login_class=")) {
-	    login_class = *cur + sizeof("login_class=") - 1;
-	    def_use_loginclass = true;
-	    continue;
-	}
-#ifdef HAVE_PRIV_SET
-	if (MATCHES(*cur, "runas_privs=")) {
-	    def_privs = *cur + sizeof("runas_privs=") - 1;
-	    continue;
-	}
-	if (MATCHES(*cur, "runas_limitprivs=")) {
-	    def_limitprivs = *cur + sizeof("runas_limitprivs=") - 1;
-	    continue;
-	}
-#endif /* HAVE_PRIV_SET */
-#ifdef HAVE_SELINUX
-	if (MATCHES(*cur, "selinux_role=")) {
-	    user_role = *cur + sizeof("selinux_role=") - 1;
-	    continue;
-	}
-	if (MATCHES(*cur, "selinux_type=")) {
-	    user_type = *cur + sizeof("selinux_type=") - 1;
-	    continue;
-	}
-#endif /* HAVE_SELINUX */
-#ifdef HAVE_BSD_AUTH_H
-	if (MATCHES(*cur, "bsdauth_type=")) {
-	    login_style = *cur + sizeof("bsdauth_type=") - 1;
-	    continue;
-	}
-#endif /* HAVE_BSD_AUTH_H */
-#if !defined(HAVE_GETPROGNAME) && !defined(HAVE___PROGNAME)
-	if (MATCHES(*cur, "progname=")) {
-	    setprogname(*cur + sizeof("progname=") - 1);
-	    continue;
-	}
-#endif
-	if (MATCHES(*cur, "network_addrs=")) {
-	    interfaces_string = *cur + sizeof("network_addrs=") - 1;
-	    set_interfaces(interfaces_string);
-	    continue;
-	}
-    }
-
-    for (cur = user_info; *cur != NULL; cur++) {
-	if (MATCHES(*cur, "user=")) {
-	    user_name = estrdup(*cur + sizeof("user=") - 1);
-	    continue;
-	}
-	if (MATCHES(*cur, "uid=")) {
-	    user_uid = (uid_t) atoi(*cur + sizeof("uid=") - 1);
-	    continue;
-	}
-	if (MATCHES(*cur, "gid=")) {
-	    p = *cur + sizeof("gid=") - 1;
-	    user_gid = (gid_t) atoi(p);
-	    continue;
-	}
-	if (MATCHES(*cur, "groups=")) {
-	    groups = *cur + sizeof("groups=") - 1;
-	    continue;
-	}
-	if (MATCHES(*cur, "cwd=")) {
-	    user_cwd = estrdup(*cur + sizeof("cwd=") - 1);
-	    continue;
-	}
-	if (MATCHES(*cur, "tty=")) {
-	    user_tty = user_ttypath = estrdup(*cur + sizeof("tty=") - 1);
-	    if (strncmp(user_tty, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
-		user_tty += sizeof(_PATH_DEV) - 1;
-	    continue;
-	}
-	if (MATCHES(*cur, "host=")) {
-	    user_host = user_shost = estrdup(*cur + sizeof("host=") - 1);
-	    if ((p = strchr(user_host, '.')))
-		user_shost = estrndup(user_host, (size_t)(p - user_host));
-	    continue;
-	}
-	if (MATCHES(*cur, "lines=")) {
-	    sudo_user.lines = atoi(*cur + sizeof("lines=") - 1);
-	    continue;
-	}
-	if (MATCHES(*cur, "cols=")) {
-	    sudo_user.cols = atoi(*cur + sizeof("cols=") - 1);
-	    continue;
-	}
-	if (MATCHES(*cur, "sid=")) {
-	    sudo_user.sid = atoi(*cur + sizeof("sid=") - 1);
-	    continue;
-	}
-    }
-    if (user_cwd == NULL)
-	user_cwd = "unknown";
-    if (user_tty == NULL)
-	user_tty = "unknown"; /* user_ttypath remains NULL */
-
-    if (groups != NULL && groups[0] != '\0') {
-	const char *cp;
-	GETGROUPS_T *gids;
-	int ngids;
-
-	/* Count number of groups, including passwd gid. */
-	ngids = 2;
-	for (cp = groups; *cp != '\0'; cp++) {
-	    if (*cp == ',')
-		ngids++;
-	}
-
-	/* The first gid in the list is the passwd group gid. */
-	gids = emalloc2(ngids, sizeof(GETGROUPS_T));
-	gids[0] = user_gid;
-	ngids = 1;
-	cp = groups;
-	for (;;) {
-	    gids[ngids] = atoi(cp);
-	    if (gids[0] != gids[ngids])
-		ngids++;
-	    cp = strchr(cp, ',');
-	    if (cp == NULL)
-		break;
-	    cp++; /* skip over comma */
-	}
-	user_gids = gids;
-	user_ngids = ngids;
-    }
+    struct sudo_nss *nss;
+    debug_decl(sudoers_cleanup, SUDO_DEBUG_PLUGIN)
 
-    /* Setup debugging if indicated. */
-    if (debug_flags != NULL) {
-	sudo_debug_init(NULL, debug_flags);
-	for (cur = settings; *cur != NULL; cur++)
-	    sudo_debug_printf(SUDO_DEBUG_INFO, "settings: %s", *cur);
-	for (cur = user_info; *cur != NULL; cur++)
-	    sudo_debug_printf(SUDO_DEBUG_INFO, "user_info: %s", *cur);
+    if (snl != NULL) {
+	tq_foreach_fwd(snl, nss)
+	    nss->close(nss);
     }
+    if (def_group_plugin)
+	group_plugin_unload();
+    sudo_endpwent();
+    sudo_endgrent();
 
-#undef MATCHES
-    debug_return_int(flags);
+    debug_return;
 }
 
 static char *
-resolve_editor(char *editor, int nfiles, char **files, char ***argv_out)
+resolve_editor(const char *ed, size_t edlen, int nfiles, char **files, char ***argv_out)
 {
-    char *cp, **nargv, *editor_path = NULL;
+    char *cp, **nargv, *editor, *editor_path = NULL;
     int ac, i, nargc;
     bool wasblank;
     debug_decl(resolve_editor, SUDO_DEBUG_PLUGIN)
 
-    editor = estrdup(editor); /* becomes part of argv_out */
+    /* Note: editor becomes part of argv_out and is not freed. */
+    editor = emalloc(edlen + 1);
+    memcpy(editor, ed, edlen);
+    editor[edlen] = '\0';
 
     /*
      * Split editor into an argument vector; editor is reused (do not free).
@@ -1516,7 +967,9 @@ resolve_editor(char *editor, int nfiles, char **files, char ***argv_out)
 static char *
 find_editor(int nfiles, char **files, char ***argv_out)
 {
-    char *cp, *editor, *editor_path = NULL, **ev, *ev0[4];
+    const char *cp, *ep, *editor;
+    char *editor_path = NULL, **ev, *ev0[4];
+    size_t len;
     debug_decl(find_editor, SUDO_DEBUG_PLUGIN)
 
     /*
@@ -1526,26 +979,26 @@ find_editor(int nfiles, char **files, char ***argv_out)
     ev0[1] = "VISUAL";
     ev0[2] = "EDITOR";
     ev0[3] = NULL;
-    for (ev = ev0; *ev != NULL; ev++) {
+    for (ev = ev0; editor_path == NULL && *ev != NULL; ev++) {
 	if ((editor = getenv(*ev)) != NULL && *editor != '\0') {
-	    editor_path = resolve_editor(editor, nfiles, files, argv_out);
-	    if (editor_path != NULL)
-		break;
+	    editor_path = resolve_editor(editor, strlen(editor), nfiles,
+		files, argv_out);
 	}
     }
     if (editor_path == NULL) {
-	/* def_editor could be a path, split it up */
-	editor = estrdup(def_editor);
-	cp = strtok(editor, ":");
-	while (cp != NULL && editor_path == NULL) {
-	    editor_path = resolve_editor(cp, nfiles, files, argv_out);
-	    cp = strtok(NULL, ":");
-	}
-	if (editor_path)
-	    efree(editor);
+	/* def_editor could be a path, split it up, avoiding strtok() */
+	cp = editor = def_editor;
+	do {
+	    if ((ep = strchr(cp, ':')) != NULL)
+		len = ep - cp;
+	    else
+		len = strlen(cp);
+	    editor_path = resolve_editor(cp, len, nfiles, files, argv_out);
+	    cp = ep + 1;
+	} while (ep != NULL && editor_path == NULL);
     }
     if (!editor_path) {
-	audit_failure(NewArgv, _("%s: command not found"), editor);
+	audit_failure(NewArgv, N_("%s: command not found"), editor);
 	warningx(_("%s: command not found"), editor);
     }
     debug_return_str(editor_path);
@@ -1587,41 +1040,15 @@ create_admin_success_flag(void)
 }
 #endif /* USE_ADMIN_FLAG */
 
-static void
-sudoers_policy_register_hooks(int version, int (*register_hook)(struct sudo_hook *hook))
+static bool
+tty_present(void)
 {
-    struct sudo_hook hook;
-
-    memset(&hook, 0, sizeof(hook));
-    hook.hook_version = SUDO_HOOK_VERSION;
-
-    hook.hook_type = SUDO_HOOK_SETENV;
-    hook.hook_fn = sudoers_hook_setenv;
-    register_hook(&hook);
-
-    hook.hook_type = SUDO_HOOK_UNSETENV;
-    hook.hook_fn = sudoers_hook_unsetenv;
-    register_hook(&hook);
-
-    hook.hook_type = SUDO_HOOK_GETENV;
-    hook.hook_fn = sudoers_hook_getenv;
-    register_hook(&hook);
-
-    hook.hook_type = SUDO_HOOK_PUTENV;
-    hook.hook_fn = sudoers_hook_putenv;
-    register_hook(&hook);
+#if defined(HAVE_STRUCT_KINFO_PROC2_P_TDEV) || defined(HAVE_STRUCT_KINFO_PROC_P_TDEV) || defined(HAVE_STRUCT_KINFO_PROC_KI_TDEV) || defined(HAVE_STRUCT_KINFO_PROC_KP_EPROC_E_TDEV) || defined(HAVE_STRUCT_PSINFO_PR_TTYDEV) || defined(HAVE_PSTAT_GETPROC) || defined(__linux__)
+    return user_ttypath != NULL;
+#else
+    int fd = open(_PATH_TTY, O_RDWR|O_NOCTTY);
+    if (fd != -1)
+	close(fd);
+    return fd != -1;
+#endif
 }
-
-__dso_public struct policy_plugin sudoers_policy = {
-    SUDO_POLICY_PLUGIN,
-    SUDO_API_VERSION,
-    sudoers_policy_open,
-    sudoers_policy_close,
-    sudoers_policy_version,
-    sudoers_policy_check,
-    sudoers_policy_list,
-    sudoers_policy_validate,
-    sudoers_policy_invalidate,
-    sudoers_policy_init_session,
-    sudoers_policy_register_hooks
-};